From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v4 27/34] Change the key type in psym_index_map
Date: Mon, 4 Apr 2022 13:53:28 -0600 [thread overview]
Message-ID: <20220404195335.2111906-28-tom@tromey.com> (raw)
In-Reply-To: <20220404195335.2111906-1-tom@tromey.com>
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 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 &output, data_buf &cpool)
}
}
-typedef std::unordered_map<partial_symtab *, unsigned int> psym_index_map;
+typedef std::unordered_map<dwarf2_per_cu_data *, unsigned int> 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.34.1
next prev parent reply other threads:[~2022-04-04 19:53 UTC|newest]
Thread overview: 40+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-04 19:53 [PATCH v4 00/34] Rewrite the DWARF "partial" reader Tom Tromey
2022-04-04 19:53 ` [PATCH v4 01/34] Allow thread-pool.h to work without threads Tom Tromey
2022-04-08 16:13 ` Pedro Alves
2022-04-04 19:53 ` [PATCH v4 02/34] Split create_addrmap_from_aranges Tom Tromey
2022-04-04 19:53 ` [PATCH v4 03/34] Fix latent bug in read_addrmap_from_aranges Tom Tromey
2022-04-04 19:53 ` [PATCH v4 04/34] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2022-04-04 19:53 ` [PATCH v4 05/34] Refactor dwarf2_get_pc_bounds Tom Tromey
2022-04-04 19:53 ` [PATCH v4 06/34] Allow ada_decode not to decode operators Tom Tromey
2022-04-04 19:53 ` [PATCH v4 07/34] Let skip_one_die not skip children Tom Tromey
2022-04-04 19:53 ` [PATCH v4 08/34] Add name splitting Tom Tromey
2022-04-04 19:53 ` [PATCH v4 09/34] Add new overload of dwarf5_djb_hash Tom Tromey
2022-04-04 19:53 ` [PATCH v4 10/34] Refactor build_type_psymtabs_reader Tom Tromey
2022-04-04 19:53 ` [PATCH v4 11/34] Add batching parameter to parallel_for_each Tom Tromey
2022-04-04 19:53 ` [PATCH v4 12/34] Return vector of results from parallel_for_each Tom Tromey
2022-04-04 19:53 ` [PATCH v4 13/34] Specialize std::hash for gdb_exception Tom Tromey
2022-04-04 19:53 ` [PATCH v4 14/34] Add "fullname" handling to file_and_directory Tom Tromey
2022-04-04 19:53 ` [PATCH v4 15/34] Introduce DWARF abbrev cache Tom Tromey
2022-04-04 19:53 ` [PATCH v4 16/34] Statically examine abbrev properties Tom Tromey
2022-04-04 19:53 ` [PATCH v4 17/34] Update skip_one_die for new " Tom Tromey
2022-04-04 19:53 ` [PATCH v4 18/34] Introduce the new DWARF index class Tom Tromey
2022-04-10 17:38 ` Tom Tromey
2022-04-14 5:32 ` Enze Li
2022-04-14 11:52 ` Simon Marchi
2022-04-04 19:53 ` [PATCH v4 19/34] The new DWARF indexer Tom Tromey
2022-04-04 19:53 ` [PATCH v4 20/34] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2022-04-04 19:53 ` [PATCH v4 21/34] Wire in the new DWARF indexer Tom Tromey
2022-04-04 19:53 ` [PATCH v4 22/34] Introduce thread-safe handling for complaints Tom Tromey
2022-04-04 19:53 ` [PATCH v4 23/34] Pre-read DWARF section data Tom Tromey
2022-04-04 19:53 ` [PATCH v4 24/34] Parallelize DWARF indexing Tom Tromey
2022-04-04 19:53 ` [PATCH v4 25/34] "Finalize" the DWARF index in the background Tom Tromey
2022-04-04 19:53 ` [PATCH v4 26/34] Rename write_psymtabs_to_index Tom Tromey
2022-04-04 19:53 ` Tom Tromey [this message]
2022-04-04 19:53 ` [PATCH v4 28/34] Change parameters to write_address_map Tom Tromey
2022-04-04 19:53 ` [PATCH v4 29/34] Genericize addrmap handling in the DWARF index writer Tom Tromey
2022-04-04 19:53 ` [PATCH v4 30/34] Adapt .gdb_index writer to new DWARF scanner Tom Tromey
2022-04-04 19:53 ` [PATCH v4 31/34] Adapt .debug_names " Tom Tromey
2022-04-04 19:53 ` [PATCH v4 32/34] Enable the new DWARF indexer Tom Tromey
2022-04-04 19:53 ` [PATCH v4 33/34] Delete DWARF psymtab code Tom Tromey
2022-04-04 19:53 ` [PATCH v4 34/34] Remove dwarf2_per_cu_data::v Tom Tromey
2022-04-12 15:30 ` [PATCH v4 00/34] Rewrite the DWARF "partial" reader Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220404195335.2111906-28-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).