From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from gateway24.websitewelcome.com (gateway24.websitewelcome.com [192.185.51.59]) by sourceware.org (Postfix) with ESMTPS id D40683858006 for ; Sat, 4 Dec 2021 20:38:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D40683858006 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 cm16.websitewelcome.com (cm16.websitewelcome.com [100.42.49.19]) by gateway24.websitewelcome.com (Postfix) with ESMTP id B659F742E7 for ; Sat, 4 Dec 2021 14:38:54 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id tbo6mobTClpqdtbo6mUxGu; Sat, 04 Dec 2021 14:38:54 -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=rfEH6MirlYcE8zxYF6e1I3+xrDHfTZ7vmits9FJQk5E=; b=vn7d6up8SJjrqdE00zBF/FLZBe rJwRBxN0c1EZRKhOpTFF9U6S5kC4wtL/jklNoYOCHeax5LskLQFw7iHz2nh8fp8GOaCDjsW4hrT7M SGvObc38t9eKRy5LU0FcdeoYy; Received: from 97-122-84-67.hlrn.qwest.net ([97.122.84.67]:51992 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 1mtbo6-000f48-DN; Sat, 04 Dec 2021 13:38:54 -0700 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH v3 26/33] Change the key type in psym_index_map Date: Sat, 4 Dec 2021 13:38:37 -0700 Message-Id: <20211204203844.1188999-27-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: 1mtbo6-000f48-DN X-Source: X-Source-Args: X-Source-Dir: X-Source-Sender: 97-122-84-67.hlrn.qwest.net (localhost.localdomain) [97.122.84.67]:51992 X-Source-Auth: tom+tromey.com X-Email-Count: 27 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes X-Spam-Status: No, score=-3031.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, GIT_PATCH_0, JMQ_SPF_NEUTRAL, RCVD_IN_DNSWL_NONE, 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:59 -0000 In order to change the DWARF index writer to avoid partial symtabs, this patch changes the key type in psym_index_map (and renames that type as well). Using the dwarf2_per_cu_data as the key makes it simpler to reuse this code with the new indexer. --- gdb/dwarf2/index-write.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 7fbc52cf05f..28c623a12dd 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -407,17 +407,17 @@ write_hash_table (mapped_symtab *symtab, data_buf &output, data_buf &cpool) } } -typedef std::unordered_map psym_index_map; +typedef std::unordered_map cu_index_map; /* Helper struct for building the address table. */ struct addrmap_index_data { - addrmap_index_data (data_buf &addr_vec_, psym_index_map &cu_index_htab_) + addrmap_index_data (data_buf &addr_vec_, cu_index_map &cu_index_htab_) : addr_vec (addr_vec_), cu_index_htab (cu_index_htab_) {} data_buf &addr_vec; - psym_index_map &cu_index_htab; + cu_index_map &cu_index_htab; int operator() (CORE_ADDR start_addr, void *obj); @@ -447,7 +447,7 @@ add_address_entry (data_buf &addr_vec, int addrmap_index_data::operator() (CORE_ADDR start_addr, void *obj) { - partial_symtab *pst = (partial_symtab *) obj; + dwarf2_psymtab *pst = (dwarf2_psymtab *) obj; if (previous_valid) add_address_entry (addr_vec, @@ -457,7 +457,7 @@ addrmap_index_data::operator() (CORE_ADDR start_addr, void *obj) previous_cu_start = start_addr; if (pst != NULL) { - const auto it = cu_index_htab.find (pst); + const auto it = cu_index_htab.find (pst->per_cu_data); gdb_assert (it != cu_index_htab.cend ()); previous_cu_index = it->second; previous_valid = true; @@ -474,7 +474,7 @@ addrmap_index_data::operator() (CORE_ADDR start_addr, void *obj) static void write_address_map (dwarf2_per_bfd *per_bfd, data_buf &addr_vec, - psym_index_map &cu_index_htab) + cu_index_map &cu_index_htab) { struct addrmap_index_data addrmap_index_data (addr_vec, cu_index_htab); @@ -1317,11 +1317,11 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file, data_buf objfile_cu_list; data_buf dwz_cu_list; - /* While we're scanning CU's create a table that maps a psymtab pointer + /* While we're scanning CU's create a table that maps a dwarf2_per_cu_data (which is what addrmap records) to its index (which is what is recorded in the index file). This will later be needed to write the address table. */ - psym_index_map cu_index_htab; + cu_index_map cu_index_htab; cu_index_htab.reserve (per_objfile->per_bfd->all_comp_units.size ()); /* Store out the .debug_type CUs, if any. */ @@ -1349,7 +1349,7 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file, recursively_write_psymbols (objfile, psymtab, &symtab, psyms_seen, this_counter); - const auto insertpair = cu_index_htab.emplace (psymtab, + const auto insertpair = cu_index_htab.emplace (per_cu, this_counter); gdb_assert (insertpair.second); } -- 2.31.1