FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

gdb: remove TYPE_FIELD macro

Browse source 
Replace all uses of it by type::field.

Note that since type::field returns a reference to the field, some spots
are used to assign the whole field structure.  See ctfread.c, function
attach_fields_to_type, for example.  This is the same as was happening
with the macro, so I don't think it's a problem, but if anybody sees a
really nicer way to do this, now could be a good time to implement it.

gdb/ChangeLog:

	* gdbtypes.h (TYPE_FIELD): Remove.  Replace all uses with
	type::field.
This commit is contained in:
Simon Marchi 2020-05-23 17:39:54 -04:00
parent 26f1625454
commit ceacbf6edf
31 changed files with 84 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

12
gdb/rust-lang.c
View file

@ -128,7 +128,7 @@ rust_underscore_fields (struct type *type)
return false;
for (i = 0; i < type->num_fields (); ++i)
{
if (!field_is_static (&TYPE_FIELD (type, i)))
if (!field_is_static (&type->field (i)))
{
char buf[20];
@ -420,7 +420,7 @@ val_print_struct (struct value *val, struct ui_file *stream, int recurse,
first_field = 1;
for (i = 0; i < type->num_fields (); ++i)
{
if (field_is_static (&TYPE_FIELD (type, i)))
if (field_is_static (&type->field (i)))
continue;
if (!first_field)
@ -735,7 +735,7 @@ rust_print_struct_def (struct type *type, const char *varstring,
std::vector<int> fields;
for (int i = 0; i < type->num_fields (); ++i)
{
if (field_is_static (&TYPE_FIELD (type, i)))
if (field_is_static (&type->field (i)))
continue;
if (is_enum && TYPE_FIELD_ARTIFICIAL (type, i))
continue;
@ -753,7 +753,7 @@ rust_print_struct_def (struct type *type, const char *varstring,
{
QUIT;
gdb_assert (!field_is_static (&TYPE_FIELD (type, i)));
gdb_assert (!field_is_static (&type->field (i)));
gdb_assert (! (is_enum && TYPE_FIELD_ARTIFICIAL (type, i)));
if (flags->print_offsets)
@ -992,7 +992,7 @@ rust_composite_type (struct type *original,
bitpos = 0;
if (field1 != NULL)
{
struct field *field = &TYPE_FIELD (result, i);
struct field *field = &result->field (i);
SET_FIELD_BITPOS (*field, bitpos);
bitpos += TYPE_LENGTH (type1) * TARGET_CHAR_BIT;
@ -1003,7 +1003,7 @@ rust_composite_type (struct type *original,
}
if (field2 != NULL)
{
struct field *field = &TYPE_FIELD (result, i);
struct field *field = &result->field (i);
unsigned align = type_align (type2);
if (align != 0)