From aaf3f3f3bb38a59125ea34afa0ef7e0e14c2e916 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Thu, 22 Sep 2022 14:50:27 +0200 Subject: [PATCH] [gdb/symtab] Add all_comp_units/all_type_units views on all_units Add all_comp_units/all_type_units views on all_units. Having the views allows us to: - easily get the number of CUs or TUs in all_units, and - easily access the nth CU or TU. This minimizes the use of tu_stats.nr_tus. Tested on x86_64-linux. --- gdb/dwarf2/index-write.c | 5 ++--- gdb/dwarf2/read.c | 33 +++++++++++++++++++++++++-------- gdb/dwarf2/read.h | 5 +++++ 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/gdb/dwarf2/index-write.c b/gdb/dwarf2/index-write.c index 09f14953bf8..4cc0ee53070 100644 --- a/gdb/dwarf2/index-write.c +++ b/gdb/dwarf2/index-write.c @@ -1286,9 +1286,8 @@ write_debug_names (dwarf2_per_objfile *per_objfile, } /* Verify that all units are represented. */ - gdb_assert (counter == (per_objfile->per_bfd->all_units.size () - - per_objfile->per_bfd->tu_stats.nr_tus)); - gdb_assert (types_counter == per_objfile->per_bfd->tu_stats.nr_tus); + gdb_assert (counter == per_objfile->per_bfd->all_comp_units.size ()); + gdb_assert (types_counter == per_objfile->per_bfd->all_type_units.size ()); for (const cooked_index_entry *entry : table->all_entries ()) nametable.insert (entry); diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index 8697fba55ea..35cce9396ae 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -2631,6 +2631,8 @@ to use the section anyway."), return 1; } +static void finalize_all_units (dwarf2_per_bfd *per_bfd); + /* Callback types for dwarf2_read_gdb_index. */ typedef gdb::function_view @@ -2722,6 +2724,8 @@ dwarf2_read_gdb_index types_list_elements); } + finalize_all_units (per_bfd); + create_addrmap_from_index (per_objfile, map.get ()); per_bfd->index_table = std::move (map); @@ -4754,6 +4758,8 @@ dwarf2_read_debug_names (dwarf2_per_objfile *per_objfile) (per_objfile, *map, section, &per_bfd->abbrev); } + finalize_all_units (per_bfd); + create_addrmap_from_aranges (per_objfile, &per_bfd->debug_aranges); per_bfd->index_table = std::move (map); @@ -5017,9 +5023,7 @@ dw2_debug_names_iterator::next () case DW_IDX_compile_unit: { /* Don't crash on bad data. */ - int nr_cus = (per_bfd->all_units.size () - - per_bfd->tu_stats.nr_tus); - if (ull >= nr_cus) + if (ull >= per_bfd->all_comp_units.size ()) { complaint (_(".debug_names entry has bad CU index %s" " [in module %s]"), @@ -5032,7 +5036,7 @@ dw2_debug_names_iterator::next () break; case DW_IDX_type_unit: /* Don't crash on bad data. */ - if (ull >= per_bfd->tu_stats.nr_tus) + if (ull >= per_bfd->all_type_units.size ()) { complaint (_(".debug_names entry has bad TU index %s" " [in module %s]"), @@ -5041,8 +5045,7 @@ dw2_debug_names_iterator::next () continue; } { - int nr_cus = (per_bfd->all_units.size () - - per_bfd->tu_stats.nr_tus); + int nr_cus = per_bfd->all_comp_units.size (); per_cu = per_bfd->get_cu (nr_cus + ull); } break; @@ -6918,7 +6921,7 @@ build_type_psymtabs (dwarf2_per_objfile *per_objfile, /* It's up to the caller to not call us multiple times. */ gdb_assert (per_objfile->per_bfd->type_unit_groups == NULL); - if (per_objfile->per_bfd->tu_stats.nr_tus == 0) + if (per_objfile->per_bfd->all_type_units.size () == 0) return; /* TUs typically share abbrev tables, and there can be way more TUs than @@ -6945,7 +6948,7 @@ build_type_psymtabs (dwarf2_per_objfile *per_objfile, /* Sort in a separate table to maintain the order of all_units for .gdb_index: TU indices directly index all_type_units. */ std::vector sorted_by_abbrev; - sorted_by_abbrev.reserve (per_objfile->per_bfd->tu_stats.nr_tus); + sorted_by_abbrev.reserve (per_objfile->per_bfd->all_type_units.size ()); for (const auto &cu : per_objfile->per_bfd->all_units) { @@ -7259,6 +7262,18 @@ read_comp_units_from_section (dwarf2_per_objfile *per_objfile, } } +/* Initialize the views on all_units. */ + +static void +finalize_all_units (dwarf2_per_bfd *per_bfd) +{ + size_t nr_tus = per_bfd->tu_stats.nr_tus; + size_t nr_cus = per_bfd->all_units.size () - nr_tus; + gdb::array_view tmp = per_bfd->all_units; + per_bfd->all_comp_units = tmp.slice (0, nr_cus); + per_bfd->all_type_units = tmp.slice (nr_cus, nr_tus); +} + /* Create a list of all compilation units in OBJFILE. This is only done for -readnow and building partial symtabs. */ @@ -7290,6 +7305,8 @@ create_all_units (dwarf2_per_objfile *per_objfile) } per_objfile->per_bfd->signatured_types = std::move (types_htab); + + finalize_all_units (per_objfile->per_bfd); } /* Return the initial uleb128 in the die at INFO_PTR. */ diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h index ce4fe52f4a2..5f01fbc1025 100644 --- a/gdb/dwarf2/read.h +++ b/gdb/dwarf2/read.h @@ -491,6 +491,11 @@ public: the target compilation unit of a particular reference. */ std::vector all_units; + /* The all_units vector contains both CUs and TUs. Provide views on the + vector that are limited to either the CU part or the TU part. */ + gdb::array_view all_comp_units; + gdb::array_view all_type_units; + /* Table of struct type_unit_group objects. The hash key is the DW_AT_stmt_list value. */ htab_up type_unit_groups; -- 2.30.2