diff options
Diffstat (limited to 'gdb')
| -rw-r--r-- | gdb/ChangeLog | 13 | ||||
| -rw-r--r-- | gdb/dwarf2/attribute.c | 5 | ||||
| -rw-r--r-- | gdb/dwarf2/attribute.h | 1 | ||||
| -rw-r--r-- | gdb/dwarf2/read.c | 16 |
4 files changed, 31 insertions, 4 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index b420a94..4f9944a 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,18 @@ 2021-02-02 Simon Marchi <simon.marchi@efficios.com> + PR gdb/26813 + * dwarf2/attribute.h (struct attribute) <set_unsigned>: Clear + requires_reprocessing flag. + * dwarf2/attribute.c (attribute::form_is_unsigned): Handle + DW_FORM_loclistx. + (attribute::form_requires_reprocessing): Handle DW_FORM_rnglistx + and DW_FORM_loclistx. + * dwarf2/read.c (read_attribute_reprocess): Use set_unsigned + instead of set_address for DW_FORM_loclistx and + DW_FORM_rnglistx. + +2021-02-02 Simon Marchi <simon.marchi@efficios.com> + * dwarf2/read.c (read_loclist_index): Remove bound check for start of offset. (read_rnglist_index): Likewise. diff --git a/gdb/dwarf2/attribute.c b/gdb/dwarf2/attribute.c index 4792610..b4f188a 100644 --- a/gdb/dwarf2/attribute.c +++ b/gdb/dwarf2/attribute.c @@ -179,6 +179,7 @@ attribute::form_is_unsigned () const || form == DW_FORM_flag_present || form == DW_FORM_udata || form == DW_FORM_rnglistx + || form == DW_FORM_loclistx || form == DW_FORM_ref1 || form == DW_FORM_ref2 || form == DW_FORM_ref4 @@ -197,7 +198,9 @@ attribute::form_requires_reprocessing () const || form == DW_FORM_strx4 || form == DW_FORM_GNU_str_index || form == DW_FORM_addrx - || form == DW_FORM_GNU_addr_index); + || form == DW_FORM_GNU_addr_index + || form == DW_FORM_rnglistx + || form == DW_FORM_loclistx); } /* See attribute.h. */ diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h index a3ff9b0..56776d6 100644 --- a/gdb/dwarf2/attribute.h +++ b/gdb/dwarf2/attribute.h @@ -223,6 +223,7 @@ struct attribute { gdb_assert (form_is_unsigned ()); u.unsnd = unsnd; + requires_reprocessing = 0; } /* Temporarily set this attribute to an unsigned integer. This is diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c index ee0f8be..4fe4f94 100644 --- a/gdb/dwarf2/read.c +++ b/gdb/dwarf2/read.c @@ -20315,10 +20315,20 @@ read_attribute_reprocess (const struct die_reader_specs *reader, attr->as_unsigned_reprocess ())); break; case DW_FORM_loclistx: - attr->set_address (read_loclist_index (cu, attr->as_unsigned ())); - break; + { + CORE_ADDR loclists_sect_off + = read_loclist_index (cu, attr->as_unsigned_reprocess ()); + + attr->set_unsigned (loclists_sect_off); + } + break; case DW_FORM_rnglistx: - attr->set_address (read_rnglist_index (cu, attr->as_unsigned (), tag)); + { + CORE_ADDR rnglists_sect_off + = read_rnglist_index (cu, attr->as_unsigned_reprocess (), tag); + + attr->set_unsigned (rnglists_sect_off); + } break; case DW_FORM_strx: case DW_FORM_strx1: |