From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway33.websitewelcome.com (gateway33.websitewelcome.com [192.185.146.210]) by sourceware.org (Postfix) with ESMTPS id 344EE38708D5 for ; Sun, 28 Feb 2021 20:38:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 344EE38708D5 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tom@tromey.com Received: from cm14.websitewelcome.com (cm14.websitewelcome.com [100.42.49.7]) by gateway33.websitewelcome.com (Postfix) with ESMTP id D02443C51791 for ; Sun, 28 Feb 2021 14:38:12 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id GSpQlo84aqvFOGSpQl2iCT; Sun, 28 Feb 2021 14:38:12 -0600 X-Authority-Reason: nr=8 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=Content-Transfer-Encoding:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc:Content-Type:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=U8dwApNuCSuoitAKJGoCTTgUdNuAns+ye4rqYFv8YQg=; b=DU+w/uJ1UcnbJcB2bkQMRh9tLm ciBrvumKQuwqIg35ToRH7Sl0Sk7dgv6uglEqNNcoqPwSo+IoxR2T0mXxQlhobI0n6xsGddmKMZc73 5Ca7R5ZZfvIYmrKlHKRwQ7Wer; Received: from 97-122-70-152.hlrn.qwest.net ([97.122.70.152]:36732 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.93) (envelope-from ) id 1lGSpQ-000Xkq-A1 for gdb-patches@sourceware.org; Sun, 28 Feb 2021 13:38:12 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Subject: [PATCH 11/26] Do not pass objfile to psymtab_discarder Date: Sun, 28 Feb 2021 13:37:48 -0700 Message-Id: <20210228203803.1693413-12-tom@tromey.com> X-Mailer: git-send-email 2.26.2 In-Reply-To: <20210228203803.1693413-1-tom@tromey.com> References: <20210228203803.1693413-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-AntiAbuse: This header was added to track abuse, please include it with any abuse report X-AntiAbuse: Primary Hostname - box5379.bluehost.com X-AntiAbuse: Original Domain - sourceware.org X-AntiAbuse: Originator/Caller UID/GID - [47 12] / [47 12] X-AntiAbuse: Sender Address Domain - tromey.com X-BWhitelist: no X-Source-IP: 97.122.70.152 X-Source-L: No X-Exim-ID: 1lGSpQ-000Xkq-A1 X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-70-152.hlrn.qwest.net (localhost.localdomain) [97.122.70.152]:36732 X-Source-Auth: tom+tromey.com X-Email-Count: 12 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3033.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_BL, RCVD_IN_MSPIKE_L5, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gdb-patches@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 28 Feb 2021 20:38:14 -0000 This changes the psymtab_discarder to not assume that partial symtabs are attached to the objfile. Instead, a psymtab_storage object is passed directly to it. gdb/ChangeLog 2021-02-28 Tom Tromey * psympriv.h (psymtab_discarder): Take psymtab_storage parameter. (~psymtab_discarder, keep): Update. : Remove. : New member. * dwarf2/read.c (dwarf2_build_psymtabs): Update. --- gdb/ChangeLog | 8 ++++++++ gdb/dwarf2/read.c | 2 +- gdb/psympriv.h | 17 ++++++++--------- 3 files changed, 17 insertions(+), 10 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index a24ead568ee..5c7a4435268 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -6372,7 +6372,7 @@ dwarf2_build_psymtabs (struct objfile *objfile) /* This isn't really ideal: all the data we allocate on the objfile's obstack is still uselessly kept around. However, freeing it seems unsafe. */ - psymtab_discarder psymtabs (objfile); + psymtab_discarder psymtabs (objfile->partial_symtabs.get ()); dwarf2_build_psymtabs_hard (per_objfile); psymtabs.keep (); diff --git a/gdb/psympriv.h b/gdb/psympriv.h index 73f00a50992..0f24c104aca 100644 --- a/gdb/psympriv.h +++ b/gdb/psympriv.h @@ -446,29 +446,28 @@ class psymtab_discarder { public: - psymtab_discarder (struct objfile *objfile) - : m_objfile (objfile), - m_psymtab (objfile->partial_symtabs->psymtabs) + psymtab_discarder (psymtab_storage *partial_symtabs) + : m_partial_symtabs (partial_symtabs), + m_psymtab (partial_symtabs->psymtabs) { } ~psymtab_discarder () { - if (m_objfile != NULL) - m_objfile->partial_symtabs->discard_psymtabs_to (m_psymtab); + if (m_partial_symtabs != nullptr) + m_partial_symtabs->discard_psymtabs_to (m_psymtab); } /* Keep any partial symbol tables that were built. */ void keep () { - m_objfile = NULL; + m_partial_symtabs = nullptr; } private: - /* The objfile. If NULL this serves as a sentinel to indicate that - the psymtabs should be kept. */ - struct objfile *m_objfile; + /* The partial symbol storage object. */ + psymtab_storage *m_partial_symtabs; /* How far back to free. */ struct partial_symtab *m_psymtab; }; -- 2.26.2