From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH 27/30] Adapt .debug_names writer to new DWARF scanner
Date: Wed, 25 Aug 2021 20:19:34 -0600 [thread overview]
Message-ID: <20210826021937.1490292-28-tom@tromey.com> (raw)
In-Reply-To: <20210826021937.1490292-1-tom@tromey.com>
This updates the .debug_names writer to work with the new DWARF
scanner.
---
gdb/dwarf2/index-write.c | 68 ++++++++++++++++++++++++++++++----------
1 file changed, 52 insertions(+), 16 deletions(-)
diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c
index 4a5ba484379..a58dea40d73 100644
--- a/gdb/dwarf2/index-write.c
+++ b/gdb/dwarf2/index-write.c
@@ -664,15 +664,10 @@ class debug_names
enum class unit_kind { cu, tu };
/* Insert one symbol. */
- void insert (const partial_symbol *psym, int cu_index, bool is_static,
- unit_kind kind)
+ void insert (int dwarf_tag, const char *name, int cu_index, bool is_static,
+ unit_kind kind, enum language lang)
{
- const int dwarf_tag = psymbol_tag (psym);
- if (dwarf_tag == 0)
- return;
- const char *name = psym->ginfo.search_name ();
-
- if (psym->ginfo.language () == language_ada)
+ if (lang == language_ada)
{
/* We want to ensure that the Ada main function's name appears
verbatim in the index. However, this name will be of the
@@ -715,6 +710,28 @@ class debug_names
value_set.emplace (symbol_value (dwarf_tag, cu_index, is_static, kind));
}
+ void insert (const partial_symbol *psym, int cu_index, bool is_static,
+ unit_kind kind)
+ {
+ const int dwarf_tag = psymbol_tag (psym);
+ if (dwarf_tag == 0)
+ return;
+ const char *name = psym->ginfo.search_name ();
+
+ insert (dwarf_tag, name, cu_index, is_static, kind,
+ psym->ginfo.language ());
+ }
+
+ void insert (const cooked_index_entry *entry)
+ {
+ const auto it = m_cu_index_htab.find (entry->per_cu);
+ gdb_assert (it != m_cu_index_htab.cend ());
+ const char *name = entry->full_name (&m_string_obstack);
+ insert (entry->tag, name, it->second, (entry->flags & IS_STATIC) != 0,
+ entry->per_cu->is_debug_types ? unit_kind::tu : unit_kind::cu,
+ entry->per_cu->lang);
+ }
+
/* Build all the tables. All symbols must be already inserted.
This function does not call file_write, caller has to do it
afterwards. */
@@ -897,6 +914,11 @@ class debug_names
m_debugstrlookup.file_write (file_str);
}
+ void add_cu (dwarf2_per_cu_data *per_cu, offset_type index)
+ {
+ m_cu_index_htab.emplace (per_cu, index);
+ }
+
private:
/* Storage for symbol names mapping them to their .debug_str section
@@ -1211,6 +1233,8 @@ class debug_names
/* Temporary storage for Ada names. */
auto_obstack m_string_obstack;
+
+ cu_index_map m_cu_index_htab;
};
/* Return iff any of the needed offsets does not fit into 32-bit
@@ -1488,29 +1512,41 @@ write_debug_names (dwarf2_per_objfile *per_objfile,
int types_counter = 0;
for (int i = 0; i < per_objfile->per_bfd->all_comp_units.size (); ++i)
{
- const dwarf2_per_cu_data *per_cu
+ dwarf2_per_cu_data *per_cu
= per_objfile->per_bfd->all_comp_units[i].get ();
- partial_symtab *psymtab = per_cu->v.psymtab;
- /* CU of a shared file from 'dwz -m' may be unused by this main
- file. It may be referenced from a local scope but in such
- case it does not need to be present in .debug_names. */
- if (psymtab == NULL)
- continue;
+ partial_symtab *psymtab;
+ if (per_objfile->per_bfd->using_index)
+ psymtab = nullptr;
+ else
+ {
+ psymtab = per_cu->v.psymtab;
+ /* CU of a shared file from 'dwz -m' may be unused by this main
+ file. It may be referenced from a local scope but in such
+ case it does not need to be present in .debug_names. */
+ if (psymtab == NULL)
+ continue;
+ }
int &this_counter = per_cu->is_debug_types ? types_counter : counter;
data_buf &this_list = per_cu->is_debug_types ? types_cu_list : cu_list;
- if (psymtab->user == NULL)
+ if (psymtab != nullptr && psymtab->user == NULL)
nametable.recursively_write_psymbols (objfile, psymtab, psyms_seen,
this_counter);
+ nametable.add_cu (per_cu, this_counter);
this_list.append_uint (nametable.dwarf5_offset_size (),
dwarf5_byte_order,
to_underlying (per_cu->sect_off));
++this_counter;
}
+ if (per_objfile->per_bfd->using_index)
+ for (const cooked_index_entry *entry
+ : per_objfile->per_bfd->cooked_index_table->all_entries ())
+ nametable.insert (entry);
+
nametable.build ();
/* No addr_vec - DWARF-5 uses .debug_aranges generated by GCC. */
--
2.31.1
next prev parent reply other threads:[~2021-08-26 2:19 UTC|newest]
Thread overview: 48+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-08-26 2:19 [PATCH 00/30] Rewrite the DWARF "partial" reader Tom Tromey
2021-08-26 2:19 ` [PATCH 01/30] Introduce make_unique_xstrndup Tom Tromey
2021-08-26 2:19 ` [PATCH 02/30] Split create_addrmap_from_aranges Tom Tromey
2021-08-26 2:19 ` [PATCH 03/30] Add dwarf2_per_cu_data::addresses_seen Tom Tromey
2021-08-26 2:19 ` [PATCH 04/30] Refactor dwarf2_get_pc_bounds Tom Tromey
2021-08-26 2:19 ` [PATCH 05/30] Allow ada_decode not to decode operators Tom Tromey
2021-08-26 2:19 ` [PATCH 06/30] Let skip_one_die not skip children Tom Tromey
2021-08-26 2:19 ` [PATCH 07/30] Add name splitting Tom Tromey
2021-08-26 2:19 ` [PATCH 08/30] Add new overload of dwarf5_djb_hash Tom Tromey
2021-08-26 2:19 ` [PATCH 09/30] Refactor build_type_psymtabs_reader Tom Tromey
2021-08-26 2:19 ` [PATCH 10/30] Add batching parameter to parallel_for_each Tom Tromey
2021-08-26 2:19 ` [PATCH 11/30] Return vector of results from parallel_for_each Tom Tromey
2021-08-27 6:20 ` Tom de Vries
2021-08-28 19:20 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 12/30] Introduce DWARF abbrev cache Tom Tromey
2021-08-26 2:19 ` [PATCH 13/30] Statically examine abbrev properties Tom Tromey
2021-09-06 22:31 ` Lancelot SIX
2021-11-04 18:00 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 14/30] Update skip_one_die for new " Tom Tromey
2021-08-26 2:19 ` [PATCH 15/30] Introduce the new DWARF index class Tom Tromey
2021-09-09 23:32 ` Lancelot SIX
2021-11-04 18:03 ` Tom Tromey
2021-08-26 2:19 ` [PATCH 16/30] The new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 17/30] Implement quick_symbol_functions for cooked DWARF index Tom Tromey
2021-08-26 2:19 ` [PATCH 18/30] Wire in the new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 19/30] Pre-read DWARF section data Tom Tromey
2021-08-26 2:19 ` [PATCH 20/30] Parallelize DWARF indexing Tom Tromey
2021-08-26 2:19 ` [PATCH 21/30] "Finalize" the DWARF index in the background Tom Tromey
2021-08-26 2:19 ` [PATCH 22/30] Rename write_psymtabs_to_index Tom Tromey
2021-08-26 2:19 ` [PATCH 23/30] Change the key type in psym_index_map Tom Tromey
2021-08-26 2:19 ` [PATCH 24/30] Change parameters to write_address_map Tom Tromey
2021-08-26 2:19 ` [PATCH 25/30] Genericize addrmap handling in the DWARF index writer Tom Tromey
2021-08-26 2:19 ` [PATCH 26/30] Adapt .gdb_index writer to new DWARF scanner Tom Tromey
2021-08-26 2:19 ` Tom Tromey [this message]
2021-08-26 2:19 ` [PATCH 28/30] Enable the new DWARF indexer Tom Tromey
2021-08-26 2:19 ` [PATCH 29/30] Delete DWARF psymtab code Tom Tromey
2021-08-26 2:19 ` [PATCH 30/30] Remove dwarf2_per_cu_data::v Tom Tromey
2021-08-26 20:32 ` [PATCH 00/30] Rewrite the DWARF "partial" reader Tom de Vries
2021-08-26 21:29 ` Tom Tromey
2021-08-27 7:31 ` Tom de Vries
2021-08-30 15:04 ` Tom Tromey
2021-09-06 19:46 ` Tom Tromey
2021-09-07 10:58 ` Tom de Vries
2021-09-07 12:16 ` Tom de Vries
2021-10-29 23:06 ` Tom Tromey
2021-09-09 19:00 ` Wei-min Pan
2021-09-11 21:08 ` Tom Tromey
2021-09-13 16:50 ` Weimin Pan
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=20210826021937.1490292-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).