From 6b9ac1796ec8eed79e8d5e4ef03a347a6c86a25c Mon Sep 17 00:00:00 2001 From: Jan Hubicka Date: Wed, 9 Dec 2015 03:15:05 +0100 Subject: re PR lto/61886 (LTO breaks fread with _FORTIFY_SOURCE=2) PR ipa/61886 * lto-streamer.h (lto_symtab_merge_decls, lto_symtab_merge_symbols, lto_symtab_prevailing_decl): MOve to lto-symtab.h. * lto-streamer-out.c (DFS::DFS_write_tree_body): Check that DECL_ABSTRACT_ORIGIN is not error_mark_node. * lto-symtab.c: Include lto-symtab.h. (lto_cgraph_replace_node): Do not merge profiles here. (lto_symtab_merge_p): New function. (lto_symtab_merge_decls_2): Honor lto_symtab_merge_p. (lto_symtab_merge_symbols_1): Turn unmerged decls into transparent aliases. (lto_symtab_merge_symbols): Do not clear node->aux; we no longer use it. (lto_symtab_prevailing_decl): Move to lto-symtab.h; rewrite. * lto.c: Include lto-symtab.h * lto-symtab.h: New. From-SVN: r231438 --- gcc/lto-streamer-out.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gcc/lto-streamer-out.c') diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 8928873..a874846 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -731,7 +731,11 @@ DFS::DFS_write_tree_body (struct output_block *ob, /* Do not follow DECL_ABSTRACT_ORIGIN. We cannot handle debug information for early inlining so drop it on the floor instead of ICEing in - dwarf2out.c. */ + dwarf2out.c. + We however use DECL_ABSTRACT_ORIGIN == error_mark_node to mark + declarations which should be eliminated by decl merging. Be sure none + leaks to this point. */ + gcc_assert (DECL_ABSTRACT_ORIGIN (expr) != error_mark_node); if ((TREE_CODE (expr) == VAR_DECL || TREE_CODE (expr) == PARM_DECL) -- cgit v1.1