From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2126) id 1B44D3858401; Tue, 12 Apr 2022 15:41:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1B44D3858401 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Change the key type in psym_index_map X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: 58f707487b8b67237dd798c48c098c7fb21f03bb X-Git-Newrev: 88a981942d16cbf4a75581aa72744e8d778bcd38 Message-Id: <20220412154122.1B44D3858401@sourceware.org> Date: Tue, 12 Apr 2022 15:41:22 +0000 (GMT) X-BeenThere: gdb-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gdb-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Apr 2022 15:41:22 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3D88a981942d16= cbf4a75581aa72744e8d778bcd38 commit 88a981942d16cbf4a75581aa72744e8d778bcd38 Author: Tom Tromey Date: Thu May 27 14:59:32 2021 -0600 Change the key type in psym_index_map =20 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. Diff: --- 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 95202db2810..958fc9bed3b 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 &ou= tput, data_buf &cpool) } } =20 -typedef std::unordered_map psym_index_map; +typedef std::unordered_map cu_index_ma= p; =20 /* 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_) {} =20 data_buf &addr_vec; - psym_index_map &cu_index_htab; + cu_index_map &cu_index_htab; =20 int operator() (CORE_ADDR start_addr, void *obj); =20 @@ -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 =3D (partial_symtab *) obj; + dwarf2_psymtab *pst =3D (dwarf2_psymtab *) obj; =20 if (previous_valid) add_address_entry (addr_vec, @@ -457,7 +457,7 @@ addrmap_index_data::operator() (CORE_ADDR start_addr, v= oid *obj) previous_cu_start =3D start_addr; if (pst !=3D NULL) { - const auto it =3D cu_index_htab.find (pst); + const auto it =3D cu_index_htab.find (pst->per_cu_data); gdb_assert (it !=3D cu_index_htab.cend ()); previous_cu_index =3D it->second; previous_valid =3D true; @@ -474,7 +474,7 @@ addrmap_index_data::operator() (CORE_ADDR start_addr, v= oid *obj) =20 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); =20 @@ -1317,11 +1317,11 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FI= LE *out_file, data_buf objfile_cu_list; data_buf dwz_cu_list; =20 - /* 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_da= ta (which is what addrmap records) to its index (which is what is record= ed 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 ()); =20 /* 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); =20 - const auto insertpair =3D cu_index_htab.emplace (psymtab, + const auto insertpair =3D cu_index_htab.emplace (per_cu, this_counter); gdb_assert (insertpair.second); }