Patchwork Fix comdat unsharing

login
register
mail settings
Submitter Jan Hubicka
Date June 14, 2011, 2:27 p.m.
Message ID <20110614142717.GD18043@kam.mff.cuni.cz>
Download mbox | patch
Permalink /patch/100349/
State New
Headers show

Comments

Jan Hubicka - June 14, 2011, 2:27 p.m.
Hi,
cgraph_address_taken_from_non_vtable_p was written with asumption that all references to functions
take addresses.  This is not true for aliases.

Bootstrapped/regtested x86_64-linux, comitted.

Honza
H.J. Lu - June 16, 2011, 3:45 p.m.
On Tue, Jun 14, 2011 at 7:27 AM, Jan Hubicka <hubicka@ucw.cz> wrote:
> Hi,
> cgraph_address_taken_from_non_vtable_p was written with asumption that all references to functions
> take addresses.  This is not true for aliases.
>
> Bootstrapped/regtested x86_64-linux, comitted.
>
> Honza
>
> Index: ChangeLog
> ===================================================================
> --- ChangeLog   (revision 175020)
> +++ ChangeLog   (working copy)
> @@ -1,3 +1,7 @@
> +2011-06-13  Jan Hubicka  <jh@suse.cz>
> +
> +       * ipa.c (cgraph_address_taken_from_non_vtable_p): Check the ref type.
> +
>  2011-06-14  Richard Henderson  <rth@redhat.com>
>

This caused:

http://gcc.gnu.org/bugzilla/show_bug.cgi?id=49439

Patch

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 175020)
+++ ChangeLog	(working copy)
@@ -1,3 +1,7 @@ 
+2011-06-13  Jan Hubicka  <jh@suse.cz>
+
+	* ipa.c (cgraph_address_taken_from_non_vtable_p): Check the ref type.
+
 2011-06-14  Richard Henderson  <rth@redhat.com>
 
 	PR debug/48459
Index: ipa.c
===================================================================
--- ipa.c	(revision 175015)
+++ ipa.c	(working copy)
@@ -543,14 +543,15 @@  cgraph_address_taken_from_non_vtable_p (
   int i;
   struct ipa_ref *ref;
   for (i = 0; ipa_ref_list_reference_iterate (&node->ref_list, i, ref); i++)
-    {
-      struct varpool_node *node;
-      if (ref->refered_type == IPA_REF_CGRAPH)
-	return true;
-      node = ipa_ref_varpool_node (ref);
-      if (!DECL_VIRTUAL_P (node->decl))
-	return true;
-    }
+    if (ref->use == IPA_REF_ADDR)
+      {
+	struct varpool_node *node;
+	if (ref->refered_type == IPA_REF_CGRAPH)
+	  return true;
+	node = ipa_ref_varpool_node (ref);
+	if (!DECL_VIRTUAL_P (node->decl))
+	  return true;
+      }
   return false;
 }