re PR lto/46940 (asm aliases with linker plugin segfaults)

	PR lto/46940
	PR lto/44463
	* lto-symtab.c (lto_symtab_merge_cgraph_nodes_1): Construct nodes
	for aliases when they are used.

	* gcc.dg/lto/pr46940_0.c: New testcase.
	* gcc.dg/lto/pr46940_1.c: New testcase.

From-SVN: r167822

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91b9b2253d20e8922652a8a16254d64d6c01876b..f2c7b5c4a744f1934b11a6017e9a5c9396d8a9bb 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-14  Jan Hubicka  <jh@suse.cz>
+
+       PR lto/46940
+       PR lto/44463
+       * lto-symtab.c (lto_symtab_merge_cgraph_nodes_1): Construct nodes
+       for aliases when they are used.
+
 2010-12-14  Joseph Myers  <joseph@codesourcery.com>
 
        * config.gcc (sparc-*-elf*, sparc-*-rtems*, sparc-*-linux*,

diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c
index f18b32224c33a45df3c8ca14e78406ad0d0b29cc..b331d5cee61bd44b97f2f7ab67bbd447a884bfb4 100644 (file)
--- a/gcc/lto-symtab.c
+++ b/gcc/lto-symtab.c
@@ -795,9 +795,26 @@ lto_symtab_merge_cgraph_nodes_1 (void **slot, void *data ATTRIBUTE_UNUSED)
   for (e = prevailing->next; e; e = e->next)
     {
       if (e->node != NULL)
-       lto_cgraph_replace_node (e->node, prevailing->node);
+       {
+         /* In case we prevail funcion by an alias, we can run into case
+            that the alias has no cgraph node attached, since it was
+            previously unused.  Create the node.  */
+         if (!prevailing->node)
+           {
+             prevailing->node = cgraph_node (prevailing->decl);
+             prevailing->node->alias = true;
+           }
+         lto_cgraph_replace_node (e->node, prevailing->node);
+       }
       if (e->vnode != NULL)
-       lto_varpool_replace_node (e->vnode, prevailing->vnode);
+       {
+         if (!prevailing->vnode)
+           {
+             prevailing->vnode = varpool_node (prevailing->decl);
+             prevailing->vnode->alias = true;
+           }
+         lto_varpool_replace_node (e->vnode, prevailing->vnode);
+       }
     }
 
   /* Drop all but the prevailing decl from the symtab.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 99c8103ddd1b259dff419bc1232119d8f61b2c6e..f3210512f89d3e40f2ae36490e89fddf7f81a10f 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2010-12-14  Jan Hubicka  <jh@suse.cz>
+
+       PR lto/46940
+       PR lto/44463
+       * gcc.dg/lto/pr46940_0.c: New testcase.
+       * gcc.dg/lto/pr46940_1.c: New testcase.
+
 2010-12-14  Nathan Froyd  <froydnj@codesourcery.com>
 
        PR c++/45330

diff --git a/gcc/testsuite/gcc.dg/lto/pr46940_0.c b/gcc/testsuite/gcc.dg/lto/pr46940_0.c
new file mode 100644 (file)
index 0000000..e9f6dc8
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr46940_0.c
@@ -0,0 +1,10 @@
+* { dg-require-linker-plugin "" } */
+* { dg-extra-ld-options "-fuse-linker-plugin" } */
+
+extern __attribute__((visibility("hidden"))) void _moz_foo (void);
+extern __typeof (_moz_foo) _moz_foo __asm__ ("" "INT__foo") __attribute__((__visibility__("hidden"))) ;
+void _moz_foo(void)
+{
+  printf ("blah\n");
+}
+extern __typeof (_moz_foo) EXT__foo __asm__("" "_moz_foo") __attribute__((__alias__("" "INT__foo")));

diff --git a/gcc/testsuite/gcc.dg/lto/pr46940_1.c b/gcc/testsuite/gcc.dg/lto/pr46940_1.c
new file mode 100644 (file)
index 0000000..0a8dab5
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/lto/pr46940_1.c
@@ -0,0 +1,5 @@
+extern void _moz_foo (void);
+main()
+{
+  _moz_foo ();
+}