gdb: remove TYPE_FIELD_TYPE macro

[deliverable/binutils-gdb.git] / gdb / compile / compile-cplus-types.c

diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 20d84a549653d33e6ee743481646ecc1238b3e6e..b04d6c6e4eaaec8c9354b35d8d79cb6275fc6796 100644 (file)
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -593,7 +593,7 @@ compile_cplus_convert_struct_or_union_members
        field_name = nullptr;
 
       gcc_type field_type
-       = instance->convert_type (TYPE_FIELD_TYPE (type, i));
+       = instance->convert_type (type->field (i).type ());
 
       if (field_is_static (&type->field (i)))
        {
@@ -648,7 +648,7 @@ compile_cplus_convert_struct_or_union_members
            | get_field_access_flag (type, i);
 
          if (bitsize == 0)
-           bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (type, i));
+           bitsize = 8 * TYPE_LENGTH (type->field (i).type ());
 
          instance->plugin ().build_field
            (field_name, field_type, field_flags, bitsize,
@@ -998,7 +998,7 @@ compile_cplus_convert_func (compile_cplus_instance *instance,
       else
        {
          array.elements[i - artificials]
-           = instance->convert_type (TYPE_FIELD_TYPE (type, i));
+           = instance->convert_type (type->field (i).type ());
        }
     }