public inbox for gcc-cvs@sourceware.org help / color / mirror / Atom feed
From: Richard Biener <rguenth@gcc.gnu.org> To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-1742] lto/106334 - relax assert during WPA tree merging Date: Tue, 19 Jul 2022 09:17:05 +0000 (GMT) [thread overview] Message-ID: <20220719091705.19AC13858439@sourceware.org> (raw) https://gcc.gnu.org/g:0f129766fdb687394f0eea04f69268b5cc034cda commit r13-1742-g0f129766fdb687394f0eea04f69268b5cc034cda Author: Richard Biener <rguenther@suse.de> Date: Tue Jul 19 10:02:40 2022 +0200 lto/106334 - relax assert during WPA tree merging The dwarf2out map of tree to symbol + offset is populated too early when streaming in trees so that when WPA tree merging decides to recycle them the mapping prevails and if we are unlucky the same address is used for another tree with a symbol + offset DIE to record. The following mitigates the resulting ICE by relaxing the assert, allowing re-use of a slot during WPA. Delaying the register would be better but it's already somewhat hairy and uglifying this further doesn't look too important right now. PR lto/106334 * dwarf2out.cc (dwarf2out_register_external_die): Allow map entry re-use during WPA. Diff: --- gcc/dwarf2out.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index e3920c898f5..3ac39c1a5b0 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -6069,7 +6069,11 @@ 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); - gcc_checking_assert (!external_die_map->get (decl)); + /* When we do tree merging during WPA 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 (flag_wpa || !external_die_map->get (decl)); sym_off_pair p = { IDENTIFIER_POINTER (get_identifier (sym)), off }; external_die_map->put (decl, p); }
reply other threads:[~2022-07-19 9:17 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20220719091705.19AC13858439@sourceware.org \ --to=rguenth@gcc.gnu.org \ --cc=gcc-cvs@gcc.gnu.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).