mirror/binutils-gdb
2
0
Fork 0
mirror of https://sourceware.org/git/binutils-gdb.git synced 2025-03-31 14:11:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

gdb/dwarf: remove cutu_reader::read_cutu_die_from_dwo abbrev table parameter

Browse Source 
This parameter is always used to set cutu_reader::m_dwo_abbrev_table.
Remove the parameter, and have read_cutu_die_from_dwo set the field
directly.

Change-Id: I6c0c7d23591fb2c3d28cdea1befa4e6b379fd0d3
Approved-By: Tom Tromey <tom@tromey.com>
This commit is contained in:
Simon Marchi 2025-03-19 15:20:31 -04:00
parent f977d551da
commit aea7d4d704
2 changed files with 6 additions and 10 deletions
gdb/dwarf2
read.cread.h

13
gdb/dwarf2/read.c

@ -2710,8 +2710,7 @@ cutu_reader::init_cu_die_reader (dwarf2_cu *cu, dwarf2_section_info *section,
void
cutu_reader::read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
die_info *stub_comp_unit_die,
const char *stub_comp_dir,
abbrev_table_up *result_dwo_abbrev_table)
const char *stub_comp_dir)
{
dwarf2_per_objfile *per_objfile = cu->per_objfile;
dwarf2_per_cu *per_cu = cu->per_cu;
@ -2829,10 +2828,10 @@ cutu_reader::read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
}
dwo_abbrev_section->read (objfile);
*result_dwo_abbrev_table
m_dwo_abbrev_table
= abbrev_table::read (dwo_abbrev_section, cu->header.abbrev_sect_off);
this->init_cu_die_reader (cu, section, dwo_unit->dwo_file,
result_dwo_abbrev_table->get ());
m_dwo_abbrev_table.get ());
/* Read in the die, filling in the attributes from the stub. This
has the benefit of simplifying the rest of the code - all the
@ -2946,8 +2945,7 @@ cutu_reader::init_tu_and_read_dwo_dies (dwarf2_per_cu *this_cu,
could share abbrev tables. */
read_cutu_die_from_dwo (cu, sig_type->dwo_unit, NULL /* stub_comp_unit_die */,
sig_type->dwo_unit->dwo_file->comp_dir,
&m_dwo_abbrev_table);
sig_type->dwo_unit->dwo_file->comp_dir);
prepare_one_comp_unit (cu, pretend_language);
}
@ -3135,8 +3133,7 @@ cutu_reader::cutu_reader (dwarf2_per_cu *this_cu,
dwo_unit = lookup_dwo_unit (cu, m_top_level_die, dwo_name);
if (dwo_unit != NULL)
read_cutu_die_from_dwo (cu, dwo_unit, m_top_level_die, nullptr,
&m_dwo_abbrev_table);
read_cutu_die_from_dwo (cu, dwo_unit, m_top_level_die, nullptr);
else
{
/* Yikes, we couldn't find the rest of the DIE, we only have

3
gdb/dwarf2/read.h

@ -1003,8 +1003,7 @@ private:
void read_cutu_die_from_dwo (dwarf2_cu *cu, dwo_unit *dwo_unit,
die_info *stub_comp_unit_die,
const char *stub_comp_dir,
abbrev_table_up *result_dwo_abbrev_table);
const char *stub_comp_dir);
void prepare_one_comp_unit (struct dwarf2_cu *cu,
enum language pretend_language);