From patchwork Tue Aug 2 06:34:48 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Biener X-Patchwork-Id: 341 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:6a10:b5d6:b0:2b9:3548:2db5 with SMTP id v22csp2790088pxt; Mon, 1 Aug 2022 23:35:37 -0700 (PDT) X-Google-Smtp-Source: AGRyM1s8YZafGJUaNVVHHL/1je0pCt20235VrpEM3n/uTpJxoaAja2XXwYQhSFtD9G7ygSln0/Kw X-Received: by 2002:a05:6402:17dc:b0:43d:a1e:67f4 with SMTP id s28-20020a05640217dc00b0043d0a1e67f4mr19429752edy.191.1659422137043; Mon, 01 Aug 2022 23:35:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659422137; cv=none; d=google.com; s=arc-20160816; b=aFuqXCu0w0WnxIm2U1yqSoz/fgAvyPs40NdqWiS0b9qr9Orm5qe4mt/P0cL2tQFW0L eb0dqsnHBpAkLE+R0Jo5tVPsw9D7eKk7NmXCxfyytmyxTU54+cY7YdgmwblAeZQWOuIU oJRC9Yw7QG6Mby6HHFymZl4T4eKSL+fKHH4HOK9RkKhx6FLvNZjRtgPoDNt6SLK/kyV4 ozd40ms3PyWodeeF0BZsncqRIpAeOmX5c83pa4oQbX8dQlppcHVgBKDrAni1ihKhi19R /P3YJER/W3mUb/bQogRaplFGQZqna2GE7i7P8OAy2lBP1z9H7ZxYl/uZkmXAWyDnp4X6 C+cA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=message-id:sender:errors-to:reply-to:from:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence :mime-version:user-agent:subject:to:date:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=3AS9EgRg4Sv9CdoclXLy0ZUHOz8gICDcxmEDuy3ZHtY=; b=hkFMRoloPo42PLNFPNO8Gg8ShGUNJ+EifMS4cyIDBaTAQ9NFxgTfIsepx1/VPncuM6 E+JRJHxW4hQJp5BBjbit77zjJMzZqIDNVizNnqEeVy4PObUoV2catTE09mdKvw+UaTI4 hrHCloOY7c3CLdNMwGx5Yoe3JZ5tGiQ7Aa73qG9EyDMwXQLNQh14NP1ISHwKvBLRaNB5 3MjN1IGwVWPxX255VbzZK0RHAdRh+CInIH8OnEb7GciZYF3HKRfGQHRObVy5F5a07Zff IlN9oi1BEMDzH1mo00TiDGMwWZV4sPRmG6+V40m3+6r6RmZRV4H3/2AQxEyA+dVqWz7P a7SA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jdsa70z0; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id sg20-20020a170907a41400b007304faaafc0si4855303ejc.432.2022.08.01.23.35.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Aug 2022 23:35:37 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=jdsa70z0; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 259FB3852765 for ; Tue, 2 Aug 2022 06:35:34 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 259FB3852765 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1659422134; bh=3AS9EgRg4Sv9CdoclXLy0ZUHOz8gICDcxmEDuy3ZHtY=; h=Date:To:Subject:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=jdsa70z0RpqzQpvrFTe6M0thHbEcL8cOTQ7VFPaVADMeEP0oywq+OfKlIuY/lscZt W0TysEo4yKLiR8oP3PzkiMyrb8kcDPjxZOUcoqEekugHU+Jjh30qGAwxRFI0bSszYS OwAhv49lHKZS424sR8UrYAbdLRz8pcZBxrkzU8v4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtp-out2.suse.de (smtp-out2.suse.de [IPv6:2001:67c:2178:6::1d]) by sourceware.org (Postfix) with ESMTPS id 8D7663856DD8 for ; Tue, 2 Aug 2022 06:34:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8D7663856DD8 Received: from relay2.suse.de (relay2.suse.de [149.44.160.134]) by smtp-out2.suse.de (Postfix) with ESMTP id 538B92021F for ; Tue, 2 Aug 2022 06:34:49 +0000 (UTC) Received: from wotan.suse.de (wotan.suse.de [10.160.0.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by relay2.suse.de (Postfix) with ESMTPS id 4E04F2C141 for ; Tue, 2 Aug 2022 06:34:49 +0000 (UTC) Date: Tue, 2 Aug 2022 06:34:48 +0000 (UTC) To: gcc-patches@gcc.gnu.org Subject: [PATCH] lto/106334 - fix previous fix wrt -flto-partition=none User-Agent: Alpine 2.22 (LSU 394 2020-01-19) MIME-Version: 1.0 X-Spam-Status: No, score=-10.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, MISSING_MID, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Biener via Gcc-patches From: Richard Biener Reply-To: Richard Biener Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" Message-Id: <20220802063534.259FB3852765@sourceware.org> X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1740030226680893785?= X-GMAIL-MSGID: =?utf-8?q?1740030226680893785?= This adjusts the assert guard to include -flto-partition=none which behaves as WPA. Bootstrapped & tested on x86_64-unknown-linux-gnu, pushed. PR lto/106334 * dwarf2out.cc (dwarf2out_register_external_die): Adjust assert. --- gcc/dwarf2out.cc | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gcc/dwarf2out.cc b/gcc/dwarf2out.cc index 3ac39c1a5b0..cfea9cf6451 100644 --- a/gcc/dwarf2out.cc +++ b/gcc/dwarf2out.cc @@ -6069,11 +6069,12 @@ dwarf2out_register_external_die (tree decl, const char *sym, if (!external_die_map) external_die_map = hash_map::create_ggc (1000); - /* 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)); + /* 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)); sym_off_pair p = { IDENTIFIER_POINTER (get_identifier (sym)), off }; external_die_map->put (decl, p); }