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

lto-symtab.h (lto_symtab_prevail_decl): Do not use DECL_ABSTRACT_ORIGIN as flag we can end up using that. 

2017-08-03  Richard Biener  <rguenther@suse.de>

	* lto-symtab.h (lto_symtab_prevail_decl): Do not use
	DECL_ABSTRACT_ORIGIN as flag we can end up using that.  Instead
	use DECL_LANG_FLAG_0.
	(lto_symtab_prevail_decl): Likewise.

From-SVN: r250856
This commit is contained in:
Richard Biener 2017-08-03 14:08:56 +00:00 committed by Richard Biener
parent 297db27910
commit 63e434cafa
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/lto/ChangeLog
View File

@ -1,3 +1,10 @@
2017-08-03 Richard Biener <rguenther@suse.de>
* lto-symtab.h (lto_symtab_prevail_decl): Do not use
DECL_ABSTRACT_ORIGIN as flag we can end up using that. Instead
use DECL_LANG_FLAG_0.
(lto_symtab_prevail_decl): Likewise.
2017-07-07 Torsten Duwe <duwe@suse.de>
* lto-lang.c (lto_attribute_table): Add entry for

8
gcc/lto/lto-symtab.h
View File

@ -23,7 +23,7 @@ extern tree lto_symtab_prevailing_decl (tree decl);
extern tree lto_symtab_prevailing_virtual_decl (tree decl);
/* Mark DECL to be previailed by PREVAILING.
Use DECL_ABSTRACT_ORIGIN and DECL_CHAIN as special markers; those do not
Use DECL_LANG_FLAG_0 and DECL_CHAIN as special markers; those do not
disturb debug_tree and diagnostics.
We are safe to modify them as we wish, because the declarations disappear
from the IL after the merging. */
@ -31,10 +31,10 @@ extern tree lto_symtab_prevailing_virtual_decl (tree decl);
inline void
lto_symtab_prevail_decl (tree prevailing, tree decl)
{
gcc_checking_assert (DECL_ABSTRACT_ORIGIN (decl) != error_mark_node);
gcc_checking_assert (! DECL_LANG_FLAG_0 (decl));
gcc_assert (TREE_PUBLIC (decl) || DECL_EXTERNAL (decl));
DECL_CHAIN (decl) = prevailing;
DECL_ABSTRACT_ORIGIN (decl) = error_mark_node;
DECL_LANG_FLAG_0 (decl) = 1;
}
/* Given the decl DECL, return the prevailing decl with the same name. */
@ -42,7 +42,7 @@ lto_symtab_prevail_decl (tree prevailing, tree decl)
inline tree
lto_symtab_prevailing_decl (tree decl)
{
if (DECL_ABSTRACT_ORIGIN (decl) == error_mark_node)
if (DECL_LANG_FLAG_0 (decl))
return DECL_CHAIN (decl);
else
{