PR ipa/63566

	* ipa-icf.c (set_local): New function.
	(sem_function::merge): Use it.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@220548 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 445e9a9..5f7c621 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,11 @@
 2015-02-08  Jan Hubicka  <hubicka@ucw.cz>
 
+       PR ipa/63566 
+       * ipa-icf.c (set_local): New function.
+       (sem_function::merge): Use it.
+
+2015-02-08  Jan Hubicka  <hubicka@ucw.cz>
+
        * ipa-devirt.c (odr_types_equivalent_p): Fix formating.
        (add_type_duplicate): Fix comparison of BINFOs.
 

diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index d19ddc3..692946a 100644 (file)
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -584,6 +584,16 @@ sem_function::equals_private (sem_item *item,
   return result;
 }
 
+/* Set LOCAL_P of NODE to true if DATA is non-NULL.
+   Helper for call_for_symbol_thunks_and_aliases.  */
+
+static bool
+set_local (cgraph_node *node, void *data)
+{
+  node->local.local = data != NULL;
+  return false;
+}
+
 /* Merges instance with an ALIAS_ITEM, where alias, thunk or redirection can
    be applied.  */
 bool
@@ -743,10 +753,8 @@ sem_function::merge (sem_item *alias_item)
       cgraph_node::create_alias (alias_func->decl, decl);
       alias->resolve_alias (original);
 
-      /* Workaround for PR63566 that forces equal calling convention
-       to be used.  */
-      alias->local.local = false;
-      original->local.local = false;
+      original->call_for_symbol_thunks_and_aliases
+        (set_local, (void *)(size_t) original->local_p (), true);
 
       if (dump_file)
        fprintf (dump_file, "Callgraph alias has been created.\n\n");