aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRichard Guenther <rguenther@suse.de>2012-09-25 11:33:17 +0000
committerRichard Biener <rguenth@gcc.gnu.org>2012-09-25 11:33:17 +0000
commit0237949a0fb9ceddec550116f057182592b8d74a (patch)
tree0006305d96c5f5c604785bc292ff991a39bc1696
parent222b68463b0e92c1a19b16e9f37af1b8f4c9c668 (diff)
downloadgcc-0237949a0fb9ceddec550116f057182592b8d74a.zip
gcc-0237949a0fb9ceddec550116f057182592b8d74a.tar.gz
gcc-0237949a0fb9ceddec550116f057182592b8d74a.tar.bz2
lto-symtab.c (lto_symtab_merge_decls_1): Properly merge all of the chain.
2012-09-25 Richard Guenther <rguenther@suse.de> * lto-symtab.c (lto_symtab_merge_decls_1): Properly merge all of the chain. From-SVN: r191699
-rw-r--r--gcc/ChangeLog5
-rw-r--r--gcc/lto-symtab.c4
2 files changed, 7 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8bcade6..2bec49a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,10 @@
2012-09-25 Richard Guenther <rguenther@suse.de>
+ * lto-symtab.c (lto_symtab_merge_decls_1): Properly merge
+ all of the chain.
+
+2012-09-25 Richard Guenther <rguenther@suse.de>
+
PR tree-optimization/53663
* tree-ssa-sccvn.c (vn_reference_lookup_3): Conditional
native encode/interpret translation on VN_WALKREWRITE.
diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c
index 58b77a3..ae73ad4 100644
--- a/gcc/lto-symtab.c
+++ b/gcc/lto-symtab.c
@@ -566,12 +566,12 @@ lto_symtab_merge_decls_1 (symtab_node first)
/* Merge the chain to the single prevailing decl and diagnose
mismatches. */
- lto_symtab_merge_decls_2 (first, diagnosed_p);
+ lto_symtab_merge_decls_2 (prevailing, diagnosed_p);
if (cgraph_dump_file)
{
fprintf (cgraph_dump_file, "After resolution:\n");
- for (e = first; e; e = e->symbol.next_sharing_asm_name)
+ for (e = prevailing; e; e = e->symbol.next_sharing_asm_name)
dump_symtab_node (cgraph_dump_file, e);
}