summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-30 11:39:19 +0000
committerrguenth <rguenth@138bc75d-0d04-0410-961f-82ee72b054a4>2013-01-30 11:39:19 +0000
commit224a26c587c46f13ec2dd3e0202a4442f742c1c9 (patch)
tree701378d14670a6bbbd12f324179e6d5ef8c99845
parent52cd005d69a7a34f36e9e8ec523fe888805d8c6a (diff)
downloadgcc-224a26c587c46f13ec2dd3e0202a4442f742c1c9.tar.gz
2013-01-30 Richard Biener <rguenther@suse.de>
PR lto/56147 * lto-symtab.c (lto_symtab_merge_decls_1): Guard DECL_BUILT_IN check. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@195575 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/lto-symtab.c3
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 797fb126bc2..47eb2c7979e 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2013-01-30 Richard Biener <rguenther@suse.de>
+
+ PR lto/56147
+ * lto-symtab.c (lto_symtab_merge_decls_1): Guard DECL_BUILT_IN
+ check.
+
2013-01-30 Georg-Johann Lay <avr@gjlay.de>
PR tree-optimization/56064
diff --git a/gcc/lto-symtab.c b/gcc/lto-symtab.c
index 84168c3c331..546601d5eba 100644
--- a/gcc/lto-symtab.c
+++ b/gcc/lto-symtab.c
@@ -443,7 +443,8 @@ lto_symtab_merge_decls_1 (symtab_node first)
else if (TREE_CODE (prevailing->symbol.decl) == FUNCTION_DECL)
{
for (e = first; e; e = e->symbol.next_sharing_asm_name)
- if (DECL_BUILT_IN (e->symbol.decl))
+ if (TREE_CODE (e->symbol.decl) == FUNCTION_DECL
+ && DECL_BUILT_IN (e->symbol.decl))
{
prevailing = e;
break;