From: Martin Liska <mliska@suse.cz>
Date: Wed, 25 Apr 2018 07:40:46 +0000 (+0200)
Subject: Backport r259274
X-Git-Tag: releases/gcc-6.5.0~354
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=7286e40aba6819e3b93035aadc0fc0078f8209af;p=thirdparty%2Fgcc.git

Backport r259274

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

	Backport from mainline
	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: r259632
---

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index c7ee40438b34..ddc3c6be92de 100644
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-25  Martin Liska  <mliska@suse.cz>
+
+	Backport from mainline
+	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-25  Martin Liska  <mliska@suse.cz>
 
 	Backport from mainline
diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index b01288d7587a..32a53b3348f9 100644
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -601,10 +601,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; "