From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 28/32] Adapt .gdb_index writer to new DWARF scanner
Date: Thu, 4 Nov 2021 12:09:03 -0600 [thread overview]
Message-ID: <20211104180907.2360627-29-tom@tromey.com> (raw)
In-Reply-To: <20211104180907.2360627-1-tom@tromey.com>
This updates the .gdb_index writer to work with the new DWARF scanner.
The .debug_names writer is deferred to another patch, to make review
simpler.
This introduces a small hack to psyms_seen_size, but is
inconsequential because this function will be deleted in a subsequent
patch.
---
gdb/dwarf2/index-write.c | 63 ++++++++++++++++++++++----
gdb/testsuite/gdb.dwarf2/gdb-index.exp | 5 +-
2 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 13b929fea54..0d8127c2898 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -189,7 +189,7 @@ struct mapped_symtab
offset_type n_elements = 0;
std::vector<symtab_index_entry> data;
- /* Temporary storage for Ada names. */
+ /* Temporary storage for names. */
auto_obstack m_string_obstack;
};
@@ -1237,6 +1237,9 @@ check_dwarf64_offsets (dwarf2_per_objfile *per_objfile)
static size_t
psyms_seen_size (dwarf2_per_objfile *per_objfile)
{
+ if (per_objfile->per_bfd->using_index)
+ return 0;
+
size_t psyms_count = 0;
for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
{
@@ -1312,6 +1315,41 @@ write_gdbindex_1 (FILE *out_file,
assert_file_size (out_file, total_len);
}
+/* Write the contents of the internal "cooked" index. */
+
+static void
+write_cooked_index (dwarf2_per_objfile *per_objfile,
+ const cu_index_map &cu_index_htab,
+ struct mapped_symtab *symtab)
+{
+ gdb_assert (per_objfile->per_bfd->using_index);
+
+ for (const cooked_index_entry *entry
+ : per_objfile->per_bfd->cooked_index_table->all_entries ())
+ {
+ const auto it = cu_index_htab.find (entry->per_cu);
+ gdb_assert (it != cu_index_htab.cend ());
+
+ const char *name = entry->full_name (&symtab->m_string_obstack);
+
+ gdb_index_symbol_kind kind;
+ if (entry->tag == DW_TAG_subprogram)
+ kind = GDB_INDEX_SYMBOL_KIND_FUNCTION;
+ else if (entry->tag == DW_TAG_variable
+ || entry->tag == DW_TAG_constant
+ || entry->tag == DW_TAG_enumerator)
+ kind = GDB_INDEX_SYMBOL_KIND_VARIABLE;
+ else if (entry->tag == DW_TAG_module
+ || entry->tag == DW_TAG_common_block)
+ kind = GDB_INDEX_SYMBOL_KIND_OTHER;
+ else
+ kind = GDB_INDEX_SYMBOL_KIND_TYPE;
+
+ add_index_entry (symtab, name, (entry->flags & IS_STATIC) != 0,
+ kind, it->second);
+ }
+}
+
/* Write contents of a .gdb_index section for OBJFILE into OUT_FILE.
If OBJFILE has an associated dwz file, write contents of a .gdb_index
section for that dwz file into DWZ_OUT_FILE. If OBJFILE does not have an
@@ -1348,7 +1386,9 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file,
{
dwarf2_per_cu_data *per_cu
= per_objfile->per_bfd->all_comp_units[i].get ();
- partial_symtab *psymtab = per_cu->v.psymtab;
+ partial_symtab *psymtab = (per_objfile->per_bfd->using_index
+ ? nullptr
+ : per_cu->v.psymtab);
int &this_counter = per_cu->is_debug_types ? types_counter : counter;
@@ -1357,7 +1397,10 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file,
if (psymtab->user == NULL)
recursively_write_psymbols (objfile, psymtab, &symtab,
psyms_seen, this_counter);
+ }
+ if (psymtab != NULL || per_objfile->per_bfd->using_index)
+ {
const auto insertpair = cu_index_htab.emplace (per_cu,
this_counter);
gdb_assert (insertpair.second);
@@ -1385,6 +1428,9 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file,
++this_counter;
}
+ if (per_objfile->per_bfd->using_index)
+ write_cooked_index (per_objfile, cu_index_htab, &symtab);
+
/* Dump the address map. */
data_buf addr_vec;
if (per_objfile->per_bfd->using_index)
@@ -1396,8 +1442,7 @@ write_gdbindex (dwarf2_per_objfile *per_objfile, FILE *out_file,
}
else
write_address_map (per_objfile->per_bfd->partial_symtabs->psymtabs_addrmap,
- addr_vec, cu_index_htab,
- per_objfile->per_bfd->using_index);
+ addr_vec, cu_index_htab, false);
/* Now that we've processed all symbols we can shrink their cu_indices
lists. */
@@ -1603,15 +1648,17 @@ write_dwarf_index (dwarf2_per_objfile *per_objfile, const char *dir,
dwarf2_per_bfd *per_bfd = per_objfile->per_bfd;
struct objfile *objfile = per_objfile->objfile;
- if (per_objfile->per_bfd->using_index)
+ if (per_objfile->per_bfd->using_index
+ && per_objfile->per_bfd->cooked_index_table == nullptr)
error (_("Cannot use an index to create the index"));
if (per_objfile->per_bfd->types.size () > 1)
error (_("Cannot make an index when the file has multiple .debug_types sections"));
- if (per_bfd->partial_symtabs == nullptr
- || !per_bfd->partial_symtabs->psymtabs
- || !per_bfd->partial_symtabs->psymtabs_addrmap)
+ if ((per_bfd->partial_symtabs == nullptr
+ || !per_bfd->partial_symtabs->psymtabs
+ || !per_bfd->partial_symtabs->psymtabs_addrmap)
+ && per_bfd->cooked_index_table == nullptr)
return;
struct stat st;
diff --git a/gdb/testsuite/gdb.dwarf2/gdb-index.exp b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
index 0b7adb5379d..19b47907dee 100644
--- a/gdb/testsuite/gdb.dwarf2/gdb-index.exp
+++ b/gdb/testsuite/gdb.dwarf2/gdb-index.exp
@@ -90,12 +90,15 @@ gdb_test_multiple "mt print objfiles ${testfile}" $test {
-re "debug_names.*${gdb_prompt} $" {
set binfile_with_index $binfile
}
- -re "Psymtabs.*${gdb_prompt} $" {
+ -re "(Psymtabs|Cooked).*${gdb_prompt} $" {
set binfile_with_index [local_add_gdb_index $binfile]
if { ${binfile_with_index} == "" } {
return -1
}
}
+ -re ".*${gdb_prompt} $" {
+ fail "unrecognized symbol reader"
+ }
}
# Ok, we have a copy of $binfile with an index.
--
2.31.1
next prev parent reply other threads:[~2021-11-04 18:12 UTC|newest]
Thread overview: 53+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-11-04 18:08 [PATCH v2 00/32] Rewrite the DWARF "partial" reader Tom Tromey
2021-11-04 18:08 ` [PATCH v2 01/32] Introduce make_unique_xstrndup Tom Tromey
2021-11-05 19:20 ` Simon Marchi
2021-11-05 20:08 ` Tom Tromey
2021-11-04 18:08 ` [PATCH v2 02/32] Split create_addrmap_from_aranges Tom Tromey
2021-11-04 18:08 ` [PATCH v2 03/32] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2021-11-04 18:08 ` [PATCH v2 04/32] Refactor dwarf2_get_pc_bounds Tom Tromey
2021-11-05 19:51 ` Simon Marchi
2021-11-24 15:53 ` Tom Tromey
2021-11-04 18:08 ` [PATCH v2 05/32] Allow ada_decode not to decode operators Tom Tromey
2021-11-04 18:08 ` [PATCH v2 06/32] Let skip_one_die not skip children Tom Tromey
2021-11-04 18:08 ` [PATCH v2 07/32] Add name splitting Tom Tromey
2021-11-04 18:08 ` [PATCH v2 08/32] Add new overload of dwarf5_djb_hash Tom Tromey
2021-11-05 20:01 ` Simon Marchi
2021-11-07 17:02 ` Tom Tromey
2021-11-04 18:08 ` [PATCH v2 09/32] Refactor build_type_psymtabs_reader Tom Tromey
2021-11-04 18:08 ` [PATCH v2 10/32] Add batching parameter to parallel_for_each Tom Tromey
2021-11-04 18:08 ` [PATCH v2 11/32] Return vector of results from parallel_for_each Tom Tromey
2021-11-17 20:37 ` Lancelot SIX
2021-11-18 14:41 ` Tom Tromey
2021-11-04 18:08 ` [PATCH v2 12/32] Specialize std::hash for gdb_exception Tom Tromey
2021-11-04 18:08 ` [PATCH v2 13/32] Introduce DWARF abbrev cache Tom Tromey
2021-11-04 18:08 ` [PATCH v2 14/32] Statically examine abbrev properties Tom Tromey
2021-11-04 18:08 ` [PATCH v2 15/32] Update skip_one_die for new " Tom Tromey
2021-11-04 18:08 ` [PATCH v2 16/32] Introduce the new DWARF index class Tom Tromey
2021-11-04 18:08 ` [PATCH v2 17/32] The new DWARF indexer Tom Tromey
2021-11-04 18:08 ` [PATCH v2 18/32] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2021-11-04 18:08 ` [PATCH v2 19/32] Wire in the new DWARF indexer Tom Tromey
2021-11-04 18:08 ` [PATCH v2 20/32] Introduce thread-safe handling for complaints Tom Tromey
2021-11-04 18:08 ` [PATCH v2 21/32] Pre-read DWARF section data Tom Tromey
2021-11-04 18:08 ` [PATCH v2 22/32] Parallelize DWARF indexing Tom Tromey
2021-11-04 18:08 ` [PATCH v2 23/32] "Finalize" the DWARF index in the background Tom Tromey
2021-11-04 18:08 ` [PATCH v2 24/32] Rename write_psymtabs_to_index Tom Tromey
2021-11-04 18:09 ` [PATCH v2 25/32] Change the key type in psym_index_map Tom Tromey
2021-11-04 18:09 ` [PATCH v2 26/32] Change parameters to write_address_map Tom Tromey
2021-11-04 18:09 ` [PATCH v2 27/32] Genericize addrmap handling in the DWARF index writer Tom Tromey
2021-11-04 18:09 ` Tom Tromey [this message]
2021-11-04 18:09 ` [PATCH v2 29/32] Adapt .debug_names writer to new DWARF scanner Tom Tromey
2021-11-04 18:09 ` [PATCH v2 30/32] Enable the new DWARF indexer Tom Tromey
2021-11-04 18:09 ` [PATCH v2 31/32] Delete DWARF psymtab code Tom Tromey
2021-11-04 18:09 ` [PATCH v2 32/32] Remove dwarf2_per_cu_data::v Tom Tromey
2021-11-06 12:25 ` [PATCH v2 00/32] Rewrite the DWARF "partial" reader Tom de Vries
2021-11-11 12:23 ` Tom de Vries
2021-11-16 23:56 ` Tom Tromey
2021-11-17 9:22 ` Tom de Vries
2021-11-18 14:43 ` Tom Tromey
2021-11-22 19:59 ` Tom Tromey
2021-11-22 20:52 ` Tom de Vries
2021-11-22 22:11 ` Tom Tromey
2021-11-23 7:56 ` Tom de Vries
2021-11-23 17:00 ` Tom Tromey
2021-11-08 17:41 ` Simon Marchi
2021-11-10 19:56 ` 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=20211104180907.2360627-29-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).