From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway23.websitewelcome.com (gateway23.websitewelcome.com [192.185.50.119]) by sourceware.org (Postfix) with ESMTPS id AF4E9385840D for ; Sat, 4 Dec 2021 20:38:49 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org AF4E9385840D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=tromey.com Authentication-Results: sourceware.org; spf=fail smtp.mailfrom=tromey.com Received: from cm12.websitewelcome.com (cm12.websitewelcome.com [100.42.49.8]) by gateway23.websitewelcome.com (Postfix) with ESMTP id 4046839E8 for ; Sat, 4 Dec 2021 14:38:49 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tbo1m4AXdjXZUtbo1mOJqc; Sat, 04 Dec 2021 14:38:49 -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:Cc:To:From:Sender:Reply-To: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=YaKGHGdyy7Jjox1SVlP7lWF6oBQuHGU2ywpkfUIXwlw=; b=syz8LBQzSvVpFBRrz34/Ap6c0z /2I9A6TKqq+a4SU2RGTBR2nR3WACuelmJEneop5YBzG9lIgHWF96jDhuYQ2GCZTSNG3/1abwvgiR2 U93p1d/TijyzDrJB63dnDhHf/; Received: from 97-122-84-67.hlrn.qwest.net ([97.122.84.67]:51986 helo=localhost.localdomain) by box5379.bluehost.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.94.2) (envelope-from ) id 1mtbo0-000epk-Tu; Sat, 04 Dec 2021 13:38:48 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 09/33] Refactor build_type_psymtabs_reader Date: Sat, 4 Dec 2021 13:38:20 -0700 Message-Id: <20211204203844.1188999-10-tom@tromey.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211204203844.1188999-1-tom@tromey.com> References: <20211204203844.1188999-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.84.67 X-Source-L: No X-Exim-ID: 1mtbo0-000epk-Tu X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-84-67.hlrn.qwest.net (localhost.localdomain) [97.122.84.67]:51986 X-Source-Auth: tom+tromey.com X-Email-Count: 10 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, SPF_HELO_PASS, SPF_NEUTRAL, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Sat, 04 Dec 2021 20:38:51 -0000 The new DWARF scanner needs to save the entire cutu_reader object, not just parts of it. In order to make this possible, this patch refactors build_type_psymtabs_reader. This change is done separately because it is easy to review in isolation and it helps make the later patches smaller. --- gdb/dwarf2/read.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index cc14d510dba..58a5e228044 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -1104,9 +1104,7 @@ static dwarf2_psymtab *create_partial_symtab (dwarf2_per_cu_data *per_cu, dwarf2_per_objfile *per_objfile, const char *name); -static void build_type_psymtabs_reader (const struct die_reader_specs *reader, - const gdb_byte *info_ptr, - struct die_info *type_unit_die); +static void build_type_psymtabs_reader (cutu_reader *reader); static void dwarf2_build_psymtabs_hard (dwarf2_per_objfile *per_objfile); @@ -7162,8 +7160,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu, /* Nothing. */ } else if (this_cu->is_debug_types) - build_type_psymtabs_reader (&reader, reader.info_ptr, - reader.comp_unit_die); + build_type_psymtabs_reader (&reader); else if (want_partial_unit || reader.comp_unit_die->tag != DW_TAG_partial_unit) process_psymtab_comp_unit_reader (&reader, reader.info_ptr, @@ -7177,9 +7174,7 @@ process_psymtab_comp_unit (dwarf2_per_cu_data *this_cu, /* Reader function for build_type_psymtabs. */ static void -build_type_psymtabs_reader (const struct die_reader_specs *reader, - const gdb_byte *info_ptr, - struct die_info *type_unit_die) +build_type_psymtabs_reader (cutu_reader *reader) { dwarf2_per_objfile *per_objfile = reader->cu->per_objfile; struct dwarf2_cu *cu = reader->cu; @@ -7190,6 +7185,8 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader, struct partial_die_info *first_die; CORE_ADDR lowpc, highpc; dwarf2_psymtab *pst; + const gdb_byte *info_ptr = reader->info_ptr; + struct die_info *type_unit_die = reader->comp_unit_die; gdb_assert (per_cu->is_debug_types); sig_type = (struct signatured_type *) per_cu; @@ -7322,8 +7319,7 @@ build_type_psymtabs (dwarf2_per_objfile *per_objfile) cutu_reader reader (tu.sig_type, per_objfile, abbrev_table.get (), nullptr, false); if (!reader.dummy_p) - build_type_psymtabs_reader (&reader, reader.info_ptr, - reader.comp_unit_die); + build_type_psymtabs_reader (&reader); } } @@ -7411,8 +7407,7 @@ process_skeletonless_type_unit (void **slot, void *info) /* This does the job that build_type_psymtabs would have done. */ cutu_reader reader (entry, per_objfile, nullptr, nullptr, false); if (!reader.dummy_p) - build_type_psymtabs_reader (&reader, reader.info_ptr, - reader.comp_unit_die); + build_type_psymtabs_reader (&reader); return 1; } -- 2.31.1