From 2a1448f2763a72c83e2ec496f78243a975b0d44e Mon Sep 17 00:00:00 2001
From: Richard Biener <rguenther@suse.de>
Date: Mon, 8 Aug 2022 09:07:23 +0200
Subject: [PATCH] lto/106540 - fix LTO tree input wrt
dwarf2out_register_external_die
I've revisited the earlier two workarounds for dwarf2out_register_external_die
getting duplicate entries. It turns out that r11-525-g03d90a20a1afcb
added dref_queue pruning to lto_input_tree but decl reading uses that
to stream in DECL_INITIAL even when in the middle of SCC streaming.
When that SCC then gets thrown away we can end up with debug nodes
registered which isn't supposed to happen. The following adjusts
the DECL_INITIAL streaming to go the in-SCC way, using lto_input_tree_1,
since no SCCs are expected at this point, just refs.
PR lto/106540
PR lto/106334
* dwarf2out.cc (dwarf2out_register_external_die): Restore
original assert.
* lto-streamer-in.cc (lto_read_tree_1): Use lto_input_tree_1
to input DECL_INITIAL, avoiding to commit drefs.
---
gcc/dwarf2out.cc | 7 +------
gcc/lto-streamer-in.cc | 7 +++++--
2 files changed, 6 insertions(+), 8 deletions(-)
diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc
index cfea9cf64517..e3920c898f5f 100644
--- a/gcc/dwarf2out.cc
+++ b/gcc/dwarf2out.cc
@@ -6069,12 +6069,7 @@ dwarf2out_register_external_die (tree decl, const char *sym,
if (!external_die_map)
external_die_map = hash_map<tree, sym_off_pair>::create_ggc (1000);
- /* When we do tree merging during WPA or with -flto-partition=none we
- can end up re-using GC memory as there's currently no way to unregister
- external DIEs. Ideally we'd register them only after merging finished
- but allowing override here is easiest. See PR106334. */
- gcc_checking_assert (!(in_lto_p && !flag_wpa)
- || !external_die_map->get (decl));
+ gcc_checking_assert (!external_die_map->get (decl));
sym_off_pair p = { IDENTIFIER_POINTER (get_identifier (sym)), off };
external_die_map->put (decl, p);
}
diff --git a/gcc/lto-streamer-in.cc b/gcc/lto-streamer-in.cc
index fe5a4e7fe1de..a7dad70363f7 100644
--- a/gcc/lto-streamer-in.cc
+++ b/gcc/lto-streamer-in.cc
@@ -1699,11 +1699,14 @@ lto_read_tree_1 (class lto_input_block *ib, class data_in *data_in, tree expr)
/* Read all the pointer fields in EXPR. */
streamer_read_tree_body (ib, data_in, expr);
- /* Read any LTO-specific data not read by the tree streamer. */
+ /* Read any LTO-specific data not read by the tree streamer. Do not use
+ stream_read_tree here since that flushes the dref_queue in mids of
+ SCC reading. */
if (DECL_P (expr)
&& TREE_CODE (expr) != FUNCTION_DECL
&& TREE_CODE (expr) != TRANSLATION_UNIT_DECL)
- DECL_INITIAL (expr) = stream_read_tree (ib, data_in);
+ DECL_INITIAL (expr)
+ = lto_input_tree_1 (ib, data_in, streamer_read_record_start (ib), 0);
/* Stream references to early generated DIEs. Keep in sync with the
trees handled in dwarf2out_register_external_die. */
--
GitLab