diff options
| author | Jan Hubicka <hubicka@ucw.cz> | 2015-12-09 23:37:02 +0100 |
|---|---|---|
| committer | Jan Hubicka <hubicka@gcc.gnu.org> | 2015-12-09 22:37:02 +0000 |
| commit | da20571a7c2a7e44ccd5999356b1131f9aa6b2de (patch) | |
| tree | 7ae5f4e79f8d1151e586b20aae84f97cc9d7fc61 /gcc/lto | |
| parent | 985f6c7969f7dd815c84f012486f17de978813b9 (diff) | |
| download | gcc-da20571a7c2a7e44ccd5999356b1131f9aa6b2de.zip gcc-da20571a7c2a7e44ccd5999356b1131f9aa6b2de.tar.gz gcc-da20571a7c2a7e44ccd5999356b1131f9aa6b2de.tar.bz2 | |
re PR lto/68811 (ICE: in get, at cgraph.h:1218)
PR lto/68811
* lto.c (lto_fixup_prevailing_decls): Do not check TREE_CHAIN of
DECL.
(LTO_NO_PREVAIL): Use gcc_checking_assert.
From-SVN: r231477
Diffstat (limited to 'gcc/lto')
| -rw-r--r-- | gcc/lto/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/lto/lto.c | 7 |
2 files changed, 12 insertions, 2 deletions
diff --git a/gcc/lto/ChangeLog b/gcc/lto/ChangeLog index 9f0733d..4fe2ebe 100644 --- a/gcc/lto/ChangeLog +++ b/gcc/lto/ChangeLog @@ -1,6 +1,13 @@ 2015-12-08 Jan Hubicka <hubicka@ucw.cz> PR lto/68811 + * lto.c (lto_fixup_prevailing_decls): Do not check TREE_CHAIN of + DECL. + (LTO_NO_PREVAIL): Use gcc_checking_assert. + +2015-12-08 Jan Hubicka <hubicka@ucw.cz> + + PR lto/68811 * lto-symtab.c (lto_symtab_merge_decls_2): Decl can never be prevailed by itself. diff --git a/gcc/lto/lto.c b/gcc/lto/lto.c index 90712b4..1b11439 100644 --- a/gcc/lto/lto.c +++ b/gcc/lto/lto.c @@ -2517,7 +2517,7 @@ lto_wpa_write_files (void) /* Ensure that TT isn't a replacable var of function decl. */ #define LTO_NO_PREVAIL(tt) \ - gcc_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt)) + gcc_checking_assert (!(tt) || !VAR_OR_FUNCTION_DECL_P (tt)) /* Given a tree T replace all fields referring to variables or functions with their prevailing variant. */ @@ -2529,7 +2529,10 @@ lto_fixup_prevailing_decls (tree t) gcc_checking_assert (code != TREE_BINFO); LTO_NO_PREVAIL (TREE_TYPE (t)); - if (CODE_CONTAINS_STRUCT (code, TS_COMMON)) + if (CODE_CONTAINS_STRUCT (code, TS_COMMON) + /* lto_symtab_prevail_decl use TREE_CHAIN to link to the prevailing decl. + in the case T is a prevailed declaration we would ICE here. */ + && !VAR_OR_FUNCTION_DECL_P (t)) LTO_NO_PREVAIL (TREE_CHAIN (t)); if (DECL_P (t)) { |