2016-01-18 Richard Biener <rguenther@suse.de>

	PR lto/69337
	* lto-symtab.c (lto_symtab_merge): Return early for mismatched
	function vs. variable.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@232505 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 352fe17..724a525 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,9 @@
+2016-01-18  Richard Biener  <rguenther@suse.de>
+
+       PR lto/69337
+       * lto-symtab.c (lto_symtab_merge): Return early for mismatched
+       function vs. variable.
+
 2016-01-12  Richard Biener  <rguenther@suse.de>
 
        PR lto/69077

diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index a6f6d01..b22dea8 100644 (file)
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -303,6 +303,9 @@ lto_symtab_merge (symtab_node *prevailing, symtab_node *entry)
   if (prevailing_decl == decl)
     return true;
 
+  if (TREE_CODE (decl) != TREE_CODE (prevailing_decl))
+    return false;
+
   /* Merge decl state in both directions, we may still end up using
      the new decl.  */
   TREE_ADDRESSABLE (prevailing_decl) |= TREE_ADDRESSABLE (decl);