From: Martin Liska <mliska@suse.cz>
Date: Tue, 10 Apr 2018 13:52:23 +0000 (+0200)
Subject: Fix obvious error in handling of error attribute (PR lto/85248).
X-Git-Tag: upstream/12.2.0~32405
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c16833dc2c512e3be8ee7cf84d9fac9853bfcd89;p=platform%2Fupstream%2Fgcc.git

Fix obvious error in handling of error attribute (PR lto/85248).

2018-04-10  Martin Liska  <mliska@suse.cz>

	PR lto/85248
	* lto-symtab.c (lto_symtab_merge_p): Do not check for
	TREE_VALUES of error attributes.

From-SVN: r259274
---

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index 2c9c7bf..75a1d1c 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,9 @@
+2018-04-10  Martin Liska  <mliska@suse.cz>
+
+	PR lto/85248
+	* lto-symtab.c (lto_symtab_merge_p): Do not check for
+	TREE_VALUES of error attributes.
+
 2018-04-10  Richard Biener  <rguenther@suse.de>
 	    Martin Liska  <mliska@suse.cz>
 
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 473c0d0..37c4f45 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -605,10 +605,7 @@ lto_symtab_merge_p (tree prevailing, tree decl)
 
       prev_attr = lookup_attribute ("noreturn", DECL_ATTRIBUTES (prevailing));
       attr = lookup_attribute ("noreturn", DECL_ATTRIBUTES (decl));
-      if ((prev_attr == NULL) != (attr == NULL)
-	  || (prev_attr
-	      && TREE_VALUE (TREE_VALUE (prev_attr))
-		 != TREE_VALUE (TREE_VALUE (attr))))
+      if ((prev_attr == NULL) != (attr == NULL))
 	{
           if (symtab->dump_file)
 	    fprintf (symtab->dump_file, "Not merging decls; "