OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Martin Liska 2018-04-24 17:18:42 +02:00 committed by Martin Liska
parent 1e38c2c902
commit 16b3803b21
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
gcc/lto/ChangeLog
View File

@ -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

5
gcc/lto/lto-symtab.c
View File

@ -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; "