From: Tom Tromey <tom@tromey.com>
To: gdb-patches@sourceware.org
Cc: Tom Tromey <tom@tromey.com>
Subject: [PATCH v2 15/20] Add attribute::as_unsigned method
Date: Sat, 4 Apr 2020 08:43:15 -0600 [thread overview]
Message-ID: <20200404144320.18851-16-tom@tromey.com> (raw)
In-Reply-To: <20200404144320.18851-1-tom@tromey.com>
This introduces a new attribute::as_unsigned method and changes a few
spots to use it.
gdb/ChangeLog
2020-04-04 Tom Tromey <tom@tromey.com>
* dwarf2/read.c (dw2_get_file_names_reader)
(dwarf2_build_include_psymtabs, handle_DW_AT_stmt_list)
(dwarf2_cu::setup_type_unit_groups, fill_in_loclist_baton)
(dwarf2_symbol_mark_computed): Use as_unsigned.
* dwarf2/attribute.h (struct attribute) <as_unsigned>: New
method.
<form_is_section_offset>: Update comment.
---
gdb/ChangeLog | 10 ++++++++++
gdb/dwarf2/attribute.h | 11 ++++++++++-
gdb/dwarf2/read.c | 22 +++++++++++-----------
3 files changed, 31 insertions(+), 12 deletions(-)
diff --git a/gdb/dwarf2/attribute.h b/gdb/dwarf2/attribute.h
index 63b9a761bf9..5d4d424d15d 100644
--- a/gdb/dwarf2/attribute.h
+++ b/gdb/dwarf2/attribute.h
@@ -82,9 +82,18 @@ struct attribute
return u.unsnd;
}
+ /* Return the unsigned value. Requires that the form be an unsigned
+ form, and that reprocessing not be needed. */
+ ULONGEST as_unsigned () const
+ {
+ gdb_assert (form_is_unsigned ());
+ gdb_assert (!requires_reprocessing);
+ return u.unsnd;
+ }
+
/* Return non-zero if ATTR's value is a section offset --- classes
lineptr, loclistptr, macptr or rangelistptr --- or zero, otherwise.
- You may use DW_UNSND (attr) to retrieve such offsets.
+ You may use the as_unsigned method to retrieve such offsets.
Section 7.5.4, "Attribute Encodings", explains that no attribute
may have a value that belongs to more than one of these classes; it
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 52fc688c47d..2be28ea1944 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -3046,11 +3046,11 @@ dw2_get_file_names_reader (const struct die_reader_specs *reader,
sect_offset line_offset {};
attr = dwarf2_attr (comp_unit_die, DW_AT_stmt_list, cu);
- if (attr != nullptr)
+ if (attr != nullptr && attr->form_is_unsigned ())
{
struct quick_file_names find_entry;
- line_offset = (sect_offset) DW_UNSND (attr);
+ line_offset = (sect_offset) attr->as_unsigned ();
/* We may have already read in this line header (TU line header sharing).
If we have we're done. */
@@ -5920,8 +5920,8 @@ dwarf2_build_include_psymtabs (struct dwarf2_cu *cu,
struct attribute *attr;
attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
- if (attr != nullptr)
- lh = dwarf_decode_line_header ((sect_offset) DW_UNSND (attr), cu);
+ if (attr != nullptr && attr->form_is_unsigned ())
+ lh = dwarf_decode_line_header ((sect_offset) attr->as_unsigned (), cu);
if (lh == NULL)
return; /* No linetable, so no includes. */
@@ -10588,10 +10588,10 @@ handle_DW_AT_stmt_list (struct die_info *die, struct dwarf2_cu *cu,
gdb_assert (! cu->per_cu->is_debug_types);
attr = dwarf2_attr (die, DW_AT_stmt_list, cu);
- if (attr == NULL)
+ if (attr == NULL || !attr->form_is_unsigned ())
return;
- sect_offset line_offset = (sect_offset) DW_UNSND (attr);
+ sect_offset line_offset = (sect_offset) attr->as_unsigned ();
/* The line header hash table is only created if needed (it exists to
prevent redundant reading of the line table for partial_units).
@@ -10780,9 +10780,9 @@ dwarf2_cu::setup_type_unit_groups (struct die_info *die)
/* We have to handle the case of both a missing DW_AT_stmt_list or bad
debug info. */
line_header_up lh;
- if (attr != NULL)
+ if (attr != NULL && attr->form_is_unsigned ())
{
- sect_offset line_offset = (sect_offset) DW_UNSND (attr);
+ sect_offset line_offset = (sect_offset) attr->as_unsigned ();
lh = dwarf_decode_line_header (line_offset, this);
}
if (lh == NULL)
@@ -22586,8 +22586,8 @@ fill_in_loclist_baton (struct dwarf2_cu *cu,
gdb_assert (baton->per_cu);
/* We don't know how long the location list is, but make sure we
don't run off the edge of the section. */
- baton->size = section->size - DW_UNSND (attr);
- baton->data = section->buffer + DW_UNSND (attr);
+ baton->size = section->size - attr->as_unsigned ();
+ baton->data = section->buffer + attr->as_unsigned ();
if (cu->base_address.has_value ())
baton->base_address = *cu->base_address;
else
@@ -22608,7 +22608,7 @@ dwarf2_symbol_mark_computed (const struct attribute *attr, struct symbol *sym,
/* .debug_loc{,.dwo} may not exist at all, or the offset may be outside
the section. If so, fall through to the complaint in the
other branch. */
- && DW_UNSND (attr) < section->get_size (objfile))
+ && attr->as_unsigned () < section->get_size (objfile))
{
struct dwarf2_loclist_baton *baton;
--
2.17.2
next prev parent reply other threads:[~2020-04-04 14:43 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-04 14:43 [PATCH v2 00/20] Make DWARF attribute references safe Tom Tromey
2020-04-04 14:43 ` [PATCH v2 01/20] Add attribute::value_as_string method Tom Tromey
2020-04-04 14:43 ` [PATCH v2 02/20] Rename struct attribute accessors Tom Tromey
2020-04-04 14:43 ` [PATCH v2 03/20] Avoid using DW_* macros in dwarf2/attribute.c Tom Tromey
2020-04-04 14:43 ` [PATCH v2 04/20] Change some uses of DW_STRING to string method Tom Tromey
2020-09-30 15:11 ` Tom de Vries
2020-09-30 19:50 ` [committed][gdb] Fix regression in dwarf2_name Tom de Vries
2020-04-04 14:43 ` [PATCH v2 05/20] Remove some uses of DW_STRING_IS_CANONICAL Tom Tromey
2020-04-04 14:43 ` [PATCH v2 06/20] Remove DW_STRING and DW_STRING_IS_CANONICAL Tom Tromey
2020-04-04 14:43 ` [PATCH v2 07/20] Remove DW_BLOCK Tom Tromey
2020-04-04 14:43 ` [PATCH v2 08/20] Remove DW_SIGNATURE Tom Tromey
2020-04-04 14:43 ` [PATCH v2 09/20] Remove DW_SND Tom Tromey
2020-04-04 14:43 ` [PATCH v2 10/20] Use setter for attribute's unsigned value Tom Tromey
2020-04-04 14:43 ` [PATCH v2 11/20] Add reprocessing flag to struct attribute Tom Tromey
2020-04-04 14:43 ` [PATCH v2 12/20] Remove DW_ADDR Tom Tromey
2020-04-04 14:43 ` [PATCH v2 13/20] Change how reprocessing is done Tom Tromey
2020-04-04 14:43 ` [PATCH v2 14/20] Change how accessibility is handled in dwarf2/read.c Tom Tromey
2020-04-04 14:43 ` Tom Tromey [this message]
2020-04-04 14:43 ` [PATCH v2 16/20] Change is_valid_DW_AT_defaulted to a method on attribute Tom Tromey
2020-04-04 14:43 ` [PATCH v2 17/20] Change die_info methods to check the attribute's form Tom Tromey
2020-04-04 14:43 ` [PATCH v2 18/20] Add attribute::as_virtuality method Tom Tromey
2020-04-04 14:43 ` [PATCH v2 19/20] Add attribute::as_boolean method Tom Tromey
2020-04-04 14:43 ` [PATCH v2 20/20] Remove DW_UNSND Tom Tromey
2020-09-30 8:35 ` Tom de Vries
2020-09-30 16:41 ` Tom Tromey
2020-09-30 2:28 ` [PATCH v2 00/20] Make DWARF attribute references safe Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200404144320.18851-16-tom@tromey.com \
--to=tom@tromey.com \
--cc=gdb-patches@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).