public inbox for gcc-patches@gcc.gnu.org
 help / color / mirror / Atom feed
* Fix dealII LTO link error
@ 2011-06-14 12:53 Jan Hubicka
  0 siblings, 0 replies; only message in thread
From: Jan Hubicka @ 2011-06-14 12:53 UTC (permalink / raw)
  To: gcc-patches

Hi,
this patch solves problem with DealII and WHOPR.  The code to handle comdat groups was written
with assumption that everything in the group is COMDAT that is not always true.

Bootstrapped/regtested x86_64-linux, comitted.

Honza

	* cgraph.c (cgraph_make_decl_local): Handle DECL_ONE_ONLY
	similarly to DECL_COMDAT.
	* cgraphunit.c (cgraph_analyze_function): Likewise.
	* ipa.c (function_and_variable_visibility): Likewise.
Index: cgraph.c
===================================================================
--- cgraph.c	(revision 175001)
+++ cgraph.c	(working copy)
@@ -2487,7 +2487,7 @@ cgraph_make_decl_local (tree decl)
     DECL_COMMON (decl) = 0;
   else gcc_assert (TREE_CODE (decl) == FUNCTION_DECL);
 
-  if (DECL_COMDAT (decl))
+  if (DECL_ONE_ONLY (decl) || DECL_COMDAT (decl))
     {
       /* It is possible that we are linking against library defining same COMDAT
 	 function.  To avoid conflict we need to rename our local name of the
Index: cgraphunit.c
===================================================================
--- cgraphunit.c	(revision 175001)
+++ cgraphunit.c	(working copy)
@@ -830,9 +830,9 @@ cgraph_analyze_function (struct cgraph_n
       if (TREE_PUBLIC (node->decl) && node->same_body_alias)
 	{
           DECL_EXTERNAL (node->decl) = DECL_EXTERNAL (node->thunk.alias);
-	  if (DECL_COMDAT (node->thunk.alias))
+	  if (DECL_ONE_ONLY (node->thunk.alias))
 	    {
-	      DECL_COMDAT (node->decl) = 1;
+	      DECL_COMDAT (node->decl) = DECL_COMDAT (node->thunk.alias);
 	      DECL_COMDAT_GROUP (node->decl) = DECL_COMDAT_GROUP (node->thunk.alias);
 	      if (DECL_ONE_ONLY (node->thunk.alias) && !node->same_comdat_group)
 		{
Index: ipa.c
===================================================================
--- ipa.c	(revision 175001)
+++ ipa.c	(working copy)
@@ -904,9 +904,9 @@ function_and_variable_visibility (bool w
 
 	     We also need to arrange the thunk into the same comdat group as
 	     the function it reffers to.  */
-	  if (DECL_COMDAT (decl_node->decl))
+	  if (DECL_ONE_ONLY (decl_node->decl))
 	    {
-	      DECL_COMDAT (node->decl) = 1;
+	      DECL_COMDAT (node->decl) = DECL_COMDAT (decl_node->decl);
 	      DECL_COMDAT_GROUP (node->decl) = DECL_COMDAT_GROUP (decl_node->decl);
 	      if (DECL_ONE_ONLY (decl_node->decl) && !node->same_comdat_group)
 		{

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2011-06-14 12:50 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2011-06-14 12:53 Fix dealII LTO link error Jan Hubicka

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).