diff options
| author | Tom Tromey <tom@tromey.com> | 2021-03-14 11:59:37 -0600 |
|---|---|---|
| committer | Tom Tromey <tom@tromey.com> | 2021-03-14 11:59:37 -0600 |
| commit | 7c290a04a2a9326c2370144f62710fc5ebcc868c (patch) | |
| tree | 9205eae54594a9d6e6fc6934f8b54116744742c7 | |
| parent | 0280fdcc0822f028d9889bb8c9559989bf71e69b (diff) | |
| download | binutils-gdb-7c290a04a2a9326c2370144f62710fc5ebcc868c.tar.gz | |
Use cu_header consistently in read_attribute_value
read_attribute_value has a local cu_header variable, but then some
spots in the function use cu->header instead. It seems better to me
to prefer the local everywhere, so this patch makes this change.
gdb/ChangeLog
2021-03-14 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (read_attribute_value): Use cu_header
consistently.
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 22 |
2 files changed, 16 insertions, 11 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ad596d8626a..3daf542077a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2021-03-14 Tom Tromey <tom@tromey.com> + * dwarf2/read.c (read_attribute_value): Use cu_header + consistently. + +2021-03-14 Tom Tromey <tom@tromey.com> + * dwarf2/read.c (struct die_reader_specs) <abfd>: Fix formatting. (peek_die_abbrev): Use reader.abfd. diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index f625a618a6d..a4eb92c7d6f 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -20332,23 +20332,23 @@ read_attribute_value (const struct die_reader_specs *reader, switch (form) { case DW_FORM_ref_addr: - if (cu->header.version == 2) - attr->set_unsigned (cu->header.read_address (abfd, info_ptr, + if (cu_header->version == 2) + attr->set_unsigned (cu_header->read_address (abfd, info_ptr, &bytes_read)); else - attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + attr->set_unsigned (cu_header->read_offset (abfd, info_ptr, &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_GNU_ref_alt: - attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + attr->set_unsigned (cu_header->read_offset (abfd, info_ptr, &bytes_read)); info_ptr += bytes_read; break; case DW_FORM_addr: { struct gdbarch *gdbarch = objfile->arch (); - CORE_ADDR addr = cu->header.read_address (abfd, info_ptr, &bytes_read); + CORE_ADDR addr = cu_header->read_address (abfd, info_ptr, &bytes_read); addr = gdbarch_adjust_dwarf2_addr (gdbarch, addr); attr->set_address (addr); info_ptr += bytes_read; @@ -20390,7 +20390,7 @@ read_attribute_value (const struct die_reader_specs *reader, attr->set_block (blk); break; case DW_FORM_sec_offset: - attr->set_unsigned (cu->header.read_offset (abfd, info_ptr, + attr->set_unsigned (cu_header->read_offset (abfd, info_ptr, &bytes_read)); info_ptr += bytes_read; break; @@ -20479,22 +20479,22 @@ read_attribute_value (const struct die_reader_specs *reader, info_ptr += bytes_read; break; case DW_FORM_ref1: - attr->set_unsigned ((to_underlying (cu->header.sect_off) + attr->set_unsigned ((to_underlying (cu_header->sect_off) + read_1_byte (abfd, info_ptr))); info_ptr += 1; break; case DW_FORM_ref2: - attr->set_unsigned ((to_underlying (cu->header.sect_off) + attr->set_unsigned ((to_underlying (cu_header->sect_off) + read_2_bytes (abfd, info_ptr))); info_ptr += 2; break; case DW_FORM_ref4: - attr->set_unsigned ((to_underlying (cu->header.sect_off) + attr->set_unsigned ((to_underlying (cu_header->sect_off) + read_4_bytes (abfd, info_ptr))); info_ptr += 4; break; case DW_FORM_ref8: - attr->set_unsigned ((to_underlying (cu->header.sect_off) + attr->set_unsigned ((to_underlying (cu_header->sect_off) + read_8_bytes (abfd, info_ptr))); info_ptr += 8; break; @@ -20503,7 +20503,7 @@ read_attribute_value (const struct die_reader_specs *reader, info_ptr += 8; break; case DW_FORM_ref_udata: - attr->set_unsigned ((to_underlying (cu->header.sect_off) + attr->set_unsigned ((to_underlying (cu_header->sect_off) + read_unsigned_leb128 (abfd, info_ptr, &bytes_read))); info_ptr += bytes_read; |