espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-12-18 00:37:28 +08:00
Code Issues Packages Projects Releases Wiki Activity

Pre-read .debug_aranges section

Browse Source 
While working on background DWARF reading, I found a race case that I
tracked down to the handling of the .debug_aranges section.  Currently
the section data is only read in after the CUs have all been created.
However, there's no real reason to do this -- it seems fine to read it
a little earlier, when all the other necessary sections are read in.

This patch makes this change, and updates the
read_addrmap_from_aranges API to assert that the section is read in.

This patch slightly changes the read_addrmap_from_aranges API as well,
to reject an empty section.  This seems better to me than what the
current code does, which is try to read an empty section but then do
no work.

Regression tested on x86-64 Fedora 38.

Reviewed-By: Guinevere Larsen <blarsen@redhat.com>
This commit is contained in:
Tom Tromey
2023-10-14 12:31:31 -06:00
parent ca362799ee
commit c7224db7af
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
gdb/dwarf2/read-debug-names.c
View File

@@ -166,6 +166,7 @@ create_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
addrmap_mutable mutable_map; addrmap_mutable mutable_map;
section->read (per_objfile->objfile);
if (read_addrmap_from_aranges (per_objfile, section, &mutable_map)) if (read_addrmap_from_aranges (per_objfile, section, &mutable_map))
per_bfd->index_addrmap per_bfd->index_addrmap
= new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack, = new (&per_bfd->obstack) addrmap_fixed (&per_bfd->obstack,

11
gdb/dwarf2/read.c
View File

@@ -1586,6 +1586,7 @@ dwarf2_per_bfd::map_info_sections (struct objfile *objfile)
ranges.read (objfile); ranges.read (objfile);
rnglists.read (objfile); rnglists.read (objfile);
addr.read (objfile); addr.read (objfile);
debug_aranges.read (objfile);
for (auto &section : types) for (auto &section : types)
section.read (objfile); section.read (objfile);
@@ -1843,6 +1844,11 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
dwarf2_section_info *section, dwarf2_section_info *section,
addrmap *mutable_map) addrmap *mutable_map)
{ {
/* Caller must ensure that the section has already been read. */
gdb_assert (section->readin);
if (section->empty ())
return false;
struct objfile *objfile = per_objfile->objfile; struct objfile *objfile = per_objfile->objfile;
bfd *abfd = objfile->obfd.get (); bfd *abfd = objfile->obfd.get ();
struct gdbarch *gdbarch = objfile->arch (); struct gdbarch *gdbarch = objfile->arch ();
@@ -1870,13 +1876,8 @@ read_addrmap_from_aranges (dwarf2_per_objfile *per_objfile,
} }
std::set<sect_offset> debug_info_offset_seen; std::set<sect_offset> debug_info_offset_seen;
section->read (objfile);
const bfd_endian dwarf5_byte_order = gdbarch_byte_order (gdbarch); const bfd_endian dwarf5_byte_order = gdbarch_byte_order (gdbarch);
const gdb_byte *addr = section->buffer; const gdb_byte *addr = section->buffer;
while (addr < section->buffer + section->size) while (addr < section->buffer + section->size)
{ {
const gdb_byte *const entry_addr = addr; const gdb_byte *const entry_addr = addr;