Backport r259274

2018-04-24  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: r259601

diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog
index fd37c1118103d3707d97d98b3aa38902316580e0..882b471cb66bf5160c0232954eb30df4abc26e43 100644 (file)
--- a/gcc/lto/ChangeLog
+++ b/gcc/lto/ChangeLog
@@ -1,3 +1,12 @@
+2018-04-24  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-24  Martin Liska  <mliska@suse.cz>
 
        Backport from mainline

diff --git a/gcc/lto/lto-symtab.c b/gcc/lto/lto-symtab.c
index 2e7493fc539af33fb5b4b334113fb1ec450d2b67..e76929ee5888cc87524518f61a91d9cbfd98fabc 100644 (file)
--- a/gcc/lto/lto-symtab.c
+++ b/gcc/lto/lto-symtab.c
@@ -604,10 +604,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; "