From: Tom Tromey Date: Fri, 2 Feb 2024 01:53:47 +0000 (-0700) Subject: Remove remnants of partial DIEs from DWARF reader X-Git-Tag: gdb-15-branchpoint~1054 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=68d3bf7d246321407697aeb036036dae1a99a742;p=thirdparty%2Fbinutils-gdb.git Remove remnants of partial DIEs from DWARF reader When rewriting the DWARF scanner, I forgot to remove dwarf2_cu::load_all_dies and dwarf2_cu::partial_dies. This patch corrects the oversight and fixes up a couple other spots that mention partial DIEs, which no longer exist. Approved-By: Tom de Vries --- diff --git a/gdb/dwarf2/cu.c b/gdb/dwarf2/cu.c index a1675b0d313..ae46dd2a9b2 100644 --- a/gdb/dwarf2/cu.c +++ b/gdb/dwarf2/cu.c @@ -42,8 +42,7 @@ dwarf2_cu::dwarf2_cu (dwarf2_per_cu_data *per_cu, producer_is_clang (false), producer_is_gas_lt_2_38 (false), producer_is_gas_2_39 (false), - processing_has_namespace_info (false), - load_all_dies (false) + processing_has_namespace_info (false) { } diff --git a/gdb/dwarf2/cu.h b/gdb/dwarf2/cu.h index d14397380de..ad89228ef8d 100644 --- a/gdb/dwarf2/cu.h +++ b/gdb/dwarf2/cu.h @@ -136,12 +136,8 @@ public: distinguish these in buildsym.c. */ struct pending **list_in_scope = nullptr; - /* Hash table holding all the loaded partial DIEs - with partial_die->offset.SECT_OFF as hash. */ - htab_t partial_dies = nullptr; - - /* Storage for things with the same lifetime as this read-in compilation - unit, including partial DIEs. */ + /* Storage for things with the same lifetime as this read-in + compilation unit. */ auto_obstack comp_unit_obstack; /* Backlink to our per_cu entry. */ @@ -274,12 +270,6 @@ public: bool processing_has_namespace_info : 1; - /* This flag will be set when reading partial DIEs if we need to load - absolutely all DIEs for this compilation unit, instead of just the ones - we think are interesting. It gets set if we look for a DIE in the - hash table and don't find it. */ - bool load_all_dies : 1; - /* Get the buildsym_compunit for this CU. */ buildsym_compunit *get_builder (); }; diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index a5a22c068eb..486be7e4921 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -25,8 +25,7 @@ along with this program. If not, see . */ /* FIXME: Various die-reading functions need to be more careful with - reading off the end of the section. - E.g., load_partial_dies, read_partial_die. */ + reading off the end of the section. */ #include "defs.h" #include "dwarf2/read.h" @@ -21475,7 +21474,7 @@ dwarf2_find_containing_comp_unit (sect_offset sect_off, if (this_cu->is_dwz != offset_in_dwz || this_cu->sect_off > sect_off) { if (low == 0 || this_cu->is_dwz != offset_in_dwz) - error (_("Dwarf Error: could not find partial DIE containing " + error (_("Dwarf Error: could not find CU containing " "offset %s [in module %s]"), sect_offset_str (sect_off), bfd_get_filename (per_bfd->obfd));