Use DW_FORM_ref_addr for DIE offset in .debug_names

Today I realized that while the .debug_names writer uses DW_FORM_udata
for the DIE offset, DW_FORM_ref_addr would be more appropriate here.
This patch makes this change.

Bug: https://sourceware.org/bugzilla/show_bug.cgi?id=31361
This commit is contained in:
Tom Tromey 2024-02-09 17:40:35 -07:00
parent 3f13a7b28c
commit 932e5949a9
2 changed files with 9 additions and 2 deletions

View File

@ -761,7 +761,7 @@ class debug_names
: DW_IDX_type_unit);
m_abbrev_table.append_unsigned_leb128 (DW_FORM_udata);
m_abbrev_table.append_unsigned_leb128 (DW_IDX_die_offset);
m_abbrev_table.append_unsigned_leb128 (DW_FORM_udata);
m_abbrev_table.append_unsigned_leb128 (DW_FORM_ref_addr);
m_abbrev_table.append_unsigned_leb128 (DW_IDX_GNU_language);
m_abbrev_table.append_unsigned_leb128 (DW_FORM_udata);
if ((entry->flags & IS_STATIC) != 0)
@ -796,7 +796,10 @@ class debug_names
gdb_assert (it != m_cu_index_htab.cend ());
m_entry_pool.append_unsigned_leb128 (it->second);
m_entry_pool.append_unsigned_leb128 (to_underlying (entry->die_offset));
m_entry_pool.append_uint (dwarf5_offset_size (),
m_dwarf5_byte_order,
to_underlying (entry->die_offset));
m_entry_pool.append_unsigned_leb128 (entry->per_cu->dw_lang ());
if (parent != nullptr)

View File

@ -155,6 +155,10 @@ mapped_debug_names_reader::scan_one_entry (const char *name,
ull = read_unsigned_leb128 (abfd, entry, &bytes_read);
entry += bytes_read;
break;
case DW_FORM_ref_addr:
ull = read_offset (abfd, entry, offset_size);
entry += offset_size;
break;
case DW_FORM_ref4:
ull = read_4_bytes (abfd, entry);
entry += 4;