Imagelibrary/binutils-gdb
1
0
Fork 1
mirror of https://github.com/bminor/binutils-gdb.git synced 2025-12-26 09:08:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove DW_STRING and DW_STRING_IS_CANONICAL

Browse Source 
This removes DW_STRING and DW_STRING_IS_CANONICAL, replacing them with
accessor methods on struct attribute.  The new code ensures that a
string value will only ever be used when the form allows it.

gdb/ChangeLog
2020-09-29  Tom Tromey  <tom@tromey.com>

	* dwarf2/read.c (read_cutu_die_from_dwo)
	(read_attribute_reprocess, read_attribute_value, read_attribute)
	(dwarf2_const_value_attr, dwarf2_name, dump_die_shallow)
	(dwarf2_fetch_constant_bytes): Update.
	* dwarf2/attribute.h (struct attribute) <form_is_string>: Declare.
	<set_string_noncanonical, set_string_canonical>: New methods.
	<string_is_canonical>: Update comment.
	<canonical_string_p>: Add assert.
	(DW_STRING, DW_STRING_IS_CANONICAL): Remove.
	* dwarf2/attribute.c (attribute::form_is_string): New method.
	(attribute::string): Use it.
This commit is contained in:
Tom Tromey
2020-09-29 18:49:08 -06:00
parent 3b64bf15bc
commit c648120540
4 changed files with 81 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
gdb/dwarf2/attribute.h
View File

@@ -98,6 +98,9 @@ struct attribute
bool form_is_block () const;
/* Check if the attribute's form is a string form. */
bool form_is_string () const;
/* Return DIE offset of this attribute. Return 0 with complaint if
the attribute is not of the required kind. */
@@ -122,16 +125,34 @@ struct attribute
flag indicates whether the value has been canonicalized. */
bool canonical_string_p () const
{
gdb_assert (form_is_string ());
return string_is_canonical;
}
/* Initialize this attribute to hold a non-canonical string
value. */
void set_string_noncanonical (const char *str)
{
gdb_assert (form_is_string ());
u.str = str;
string_is_canonical = 0;
}
/* Set the canonical string value for this attribute. */
void set_string_canonical (const char *str)
{
gdb_assert (form_is_string ());
u.str = str;
string_is_canonical = 1;
}
ENUM_BITFIELD(dwarf_attribute) name : 16;
ENUM_BITFIELD(dwarf_form) form : 15;
/* Has DW_STRING already been updated by dwarf2_canonicalize_name? This
field should be in u.str (existing only for DW_STRING) but it is kept
here for better struct attribute alignment. */
/* Has u.str already been updated by dwarf2_canonicalize_name? This
field should be in u.str but it is kept here for better struct
attribute alignment. */
unsigned int string_is_canonical : 1;
union
@@ -154,8 +175,6 @@ private:
/* Get at parts of an attribute structure. */
#define DW_STRING(attr) ((attr)->u.str)
#define DW_STRING_IS_CANONICAL(attr) ((attr)->string_is_canonical)
#define DW_UNSND(attr) ((attr)->u.unsnd)
#define DW_BLOCK(attr) ((attr)->u.blk)
#define DW_SND(attr) ((attr)->u.snd)