From 903b0a8b6833a5b182461bc73d0f84423ae8c046 Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Sun, 12 Jun 2011 18:39:38 +0200 Subject: [PATCH] re PR middle-end/49378 (C++ is broken) PR middle-end/49378 * ipa.c (cgraph_non_local_node_p_1, cgraph_local_node_p): Rule out aliases and thunks. From-SVN: r174969 --- gcc/ChangeLog | 6 ++++++ gcc/ipa.c | 10 +++++++++- 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index a1dd32d885e..2bcc01b0e3c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2011-06-11 Jan Hubicka + + PR middle-end/49378 + * ipa.c (cgraph_non_local_node_p_1, cgraph_local_node_p): Rule out + aliases and thunks. + 2011-06-12 Ira Rosen * tree-vect-data-refs.c (vect_peeling_hash_get_most_frequent): diff --git a/gcc/ipa.c b/gcc/ipa.c index 4fd3b7ce598..3f7dac33cf4 100644 --- a/gcc/ipa.c +++ b/gcc/ipa.c @@ -119,7 +119,9 @@ process_references (struct ipa_ref_list *list, static bool cgraph_non_local_node_p_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED) { + /* FIXME: Aliases can be local, but i386 gets thunks wrong then. */ return !(cgraph_only_called_directly_or_aliased_p (node) + && !ipa_ref_has_aliases_p (&node->ref_list) && node->analyzed && !DECL_EXTERNAL (node->decl) && !node->local.externally_visible @@ -132,7 +134,13 @@ cgraph_non_local_node_p_1 (struct cgraph_node *node, void *data ATTRIBUTE_UNUSED static bool cgraph_local_node_p (struct cgraph_node *node) { - return !cgraph_for_node_and_aliases (cgraph_function_or_thunk_node (node, NULL), + struct cgraph_node *n = cgraph_function_or_thunk_node (node, NULL); + + /* FIXME: thunks can be considered local, but we need prevent i386 + from attempting to change calling convention of them. */ + if (n->thunk.thunk_p) + return false; + return !cgraph_for_node_and_aliases (n, cgraph_non_local_node_p_1, NULL, true); } -- 2.30.2