re PR bootstrap/63622 (Bootstrap fails on x86_64-apple-darwin1[34] after revision...

PR ipa/63622

        PR ipa/63795
	* g++.dg/ipa/ipa-icf-4.C: Add more precise dump scan.
	* g++.dg/ipa/ipa-icf-5.C: Add condition for target
	with symbol alias support.
	* ipa-icf.c (sem_function::merge): Add new target symbol alias
	support guard.
	(sem_variable::merge): Likewise.
	* ipa-icf.h (target_supports_symbol_aliases_p): New function.

From-SVN: r217355

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2d57bd3cc931aaaaad666c28a1f74ff6f0b97f7c..73323efb67693cccee712c76fcb62ea63af22bc8 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2014-11-11  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/63622
+       PR ipa/63795
+       * ipa-icf.c (sem_function::merge): Add new target symbol alias
+       support guard.
+       (sem_variable::merge): Likewise.
+       * ipa-icf.h (target_supports_symbol_aliases_p): New function.
+
 2014-11-11  Richard Biener  <rguenther@suse.de>
 
        * match.pd: Implement patterns from associate_plusminus

diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index 84cc0ca0ba18266152892d34221ca8aa24bf51f0..92ec82d7c8a9b428a87f6bd7a5a282e96621dabd 100644 (file)
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -191,6 +191,18 @@ sem_item::dump (void)
     }
 }
 
+/* Return true if target supports alias symbols.  */
+
+bool
+sem_item::target_supports_symbol_aliases_p (void)
+{
+#if !defined (ASM_OUTPUT_DEF) || (!defined(ASM_OUTPUT_WEAK_ALIAS) && !defined (ASM_WEAKEN_DECL))
+  return false;
+#else
+  return true;
+#endif
+}
+
 /* Semantic function constructor that uses STACK as bitmap memory stack.  */
 
 sem_function::sem_function (bitmap_obstack *stack): sem_item (FUNC, stack),
@@ -589,7 +601,8 @@ sem_function::merge (sem_item *alias_item)
       redirect_callers = false;
     }
 
-  if (create_alias && DECL_COMDAT_GROUP (alias->decl))
+  if (create_alias && (DECL_COMDAT_GROUP (alias->decl)
+                      || !sem_item::target_supports_symbol_aliases_p ()))
     {
       create_alias = false;
       create_thunk = true;
@@ -605,6 +618,14 @@ sem_function::merge (sem_item *alias_item)
     local_original
       = dyn_cast <cgraph_node *> (original->noninterposable_alias ());
 
+    if (!local_original)
+      {
+       if (dump_file)
+         fprintf (dump_file, "Noninterposable alias cannot be created.\n\n");
+
+       return false;
+      }
+
   if (redirect_callers)
     {
       /* If alias is non-overwritable then
@@ -649,7 +670,7 @@ sem_function::merge (sem_item *alias_item)
       alias->resolve_alias (original);
 
       /* Workaround for PR63566 that forces equal calling convention
-        to be used.  */
+       to be used.  */
       alias->local.local = false;
       original->local.local = false;
 
@@ -1155,6 +1176,13 @@ sem_variable::merge (sem_item *alias_item)
 {
   gcc_assert (alias_item->type == VAR);
 
+  if (!sem_item::target_supports_symbol_aliases_p ())
+    {
+      if (dump_file)
+       fprintf (dump_file, "Symbol aliases are not supported by target\n\n");
+      return false;
+    }
+
   sem_variable *alias_var = static_cast<sem_variable *> (alias_item);
 
   varpool_node *original = get_node ();

diff --git a/gcc/ipa-icf.h b/gcc/ipa-icf.h
index d8e7b163a166667053fa3a37c148f674d760c708..046e858c6a8afa89f6dbf47ae0144e2837bbf44a 100644 (file)
--- a/gcc/ipa-icf.h
+++ b/gcc/ipa-icf.h
@@ -138,9 +138,11 @@ public:
 
   /* Return base tree that can be used for compatible_types_p and
      contains_polymorphic_type_p comparison.  */
-
   static bool get_base_types (tree *t1, tree *t2);
 
+  /* Return true if target supports alias symbols.  */
+  bool target_supports_symbol_aliases_p (void);
+
   /* Item type.  */
   sem_item_type type;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3672bc62823857d343bf4de7d2cae604846b4ab4..c3f633a985afc9235766e3c7b3964898b7e3c84d 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,11 @@
+2014-11-11  Martin Liska  <mliska@suse.cz>
+
+       PR ipa/63622
+       PR ipa/63795
+       * g++.dg/ipa/ipa-icf-4.C: Add more precise dump scan.
+       * g++.dg/ipa/ipa-icf-5.C: Add condition for target
+       with symbol alias support.
+
 2014-11-10  Andi Kleen  <ak@linux.intel.com>
 
        * c-c++-common/cilk-plus/AN/misc.c (main): Handle

diff --git a/gcc/testsuite/g++.dg/ipa/ipa-icf-4.C b/gcc/testsuite/g++.dg/ipa/ipa-icf-4.C
index 943428967736536993219f03660959f28d510d8e..912e06b9b43df1e76f6ae3c59696e5cbced95a12 100644 (file)
--- a/gcc/testsuite/g++.dg/ipa/ipa-icf-4.C
+++ b/gcc/testsuite/g++.dg/ipa/ipa-icf-4.C
@@ -43,6 +43,6 @@ int main()
   return 123;
 }
 
-/* { dg-final { scan-ipa-dump "Varpool alias has been created" "icf"  } } */
+/* { dg-final { scan-ipa-dump "\(Varpool alias has been created\)|\(Symbol aliases are not supported by target\)" "icf"  } } */
 /* { dg-final { scan-ipa-dump "Equal symbols: 6" "icf"  } } */
 /* { dg-final { cleanup-ipa-dump "icf" } } */

diff --git a/gcc/testsuite/g++.dg/ipa/ipa-icf-5.C b/gcc/testsuite/g++.dg/ipa/ipa-icf-5.C
index f8358141fd44e0cbedbab6a0ba06d26f6ae062c7..57dcb782fc40fd45861f65d76900f8a3f130d18b 100644 (file)
--- a/gcc/testsuite/g++.dg/ipa/ipa-icf-5.C
+++ b/gcc/testsuite/g++.dg/ipa/ipa-icf-5.C
@@ -1,5 +1,6 @@
 /* { dg-do compile } */
 /* { dg-require-visibility "" } */
+/* { dg-require-alias "" } */
 /* { dg-options "-O2 -fdump-ipa-icf" } */
 
 struct test