From: Jan Hubicka <hubicka@ucw.cz>
Date: Sat, 28 Feb 2015 22:53:37 +0000 (+0100)
Subject: re PR ipa/65237 (r221040 caused many regressions)
X-Git-Tag: releases/gcc-5.1.0~698
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=bbcdfb939d7ef82bd50afe51b1f332f7191e6d27;p=thirdparty%2Fgcc.git

re PR ipa/65237 (r221040 caused many regressions)

	PR ipa/65237
	* ipa-icf.c (sem_function::merge): Do not attempt to produce alias
	across COMDAT group boundary.

From-SVN: r221079
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index db44c2894f56..4c45c2e72642 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2015-02-28  Jan Hubicka  <hubicka@ucw.cz>
+
+	PR ipa/65237
+	* ipa-icf.c (sem_function::merge): Do not attempt to produce alias
+	across COMDAT group boundary.
+
 2015-02-28  Jan Hubicka  <hubicka@ucw.cz>
 
 	PR ipa/65232
diff --git a/gcc/ipa-icf.c b/gcc/ipa-icf.c
index ef7c855c8e13..d66d4c8c07b7 100644
--- a/gcc/ipa-icf.c
+++ b/gcc/ipa-icf.c
@@ -755,12 +755,17 @@ sem_function::merge (sem_item *alias_item)
 	it is an external functions where we can not create an alias
 	(ORIGINAL_DISCARDABLE)
      3) if target do not support symbol aliases.
+     4) original and alias lie in different comdat groups.
 
      If we can not produce alias, we will turn ALIAS into WRAPPER of ORIGINAL
      and/or redirect all callers from ALIAS to ORIGINAL.  */
   if ((original_address_matters && alias_address_matters)
-      || original_discardable
-      || !sem_item::target_supports_symbol_aliases_p ())
+      || (original_discardable
+	  && (!DECL_COMDAT_GROUP (alias->decl)
+	      || (DECL_COMDAT_GROUP (alias->decl)
+		  != DECL_COMDAT_GROUP (original->decl))))
+      || !sem_item::target_supports_symbol_aliases_p ()
+      || DECL_COMDAT_GROUP (alias->decl) != DECL_COMDAT_GROUP (original->decl))
     {
       /* First see if we can produce wrapper.  */