gdb: remove TYPE_FIELD_TYPE macro

[deliverable/binutils-gdb.git] / gdb / c-typeprint.c

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 2636a5387cfc973aadbb04f7e3e43ce61d6a63cc..e10a4858a03cc9371f7b7e63dd34a395ec2beb2b 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -573,7 +573,7 @@ c_type_print_args (struct type *type, struct ui_file *stream,
          wrap_here ("    ");
        }
 
-      param_type = TYPE_FIELD_TYPE (type, i);
+      param_type = type->field (i).type ();
 
       if (language == language_cplus && linkage_name)
        {
@@ -1179,8 +1179,8 @@ c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
          int newshow = show - 1;
 
          if (!is_static && flags->print_offsets
-             && (TYPE_FIELD_TYPE (type, i)->code () == TYPE_CODE_STRUCT
-                 || TYPE_FIELD_TYPE (type, i)->code () == TYPE_CODE_UNION))
+             && (type->field (i).type ()->code () == TYPE_CODE_STRUCT
+                 || type->field (i).type ()->code () == TYPE_CODE_UNION))
            {
              /* If we're printing offsets and this field's type is
                 either a struct or an union, then we're interested in
@@ -1200,10 +1200,10 @@ c_type_print_base_struct_union (struct type *type, struct ui_file *stream,
                 the whole struct/union.  */
              local_podata.end_bitpos
                = podata->end_bitpos
-                 - TYPE_LENGTH (TYPE_FIELD_TYPE (type, i)) * TARGET_CHAR_BIT;
+                 - TYPE_LENGTH (type->field (i).type ()) * TARGET_CHAR_BIT;
            }
 
-         c_print_type_1 (TYPE_FIELD_TYPE (type, i),
+         c_print_type_1 (type->field (i).type (),
                          TYPE_FIELD_NAME (type, i),
                          stream, newshow, level + 4,
                          language, &local_flags, &local_podata);
@@ -1645,7 +1645,7 @@ c_type_print_base_1 (struct type *type, struct ui_file *stream,
                print_spaces_filtered (level + 4, stream);
                /* We pass "show" here and not "show - 1" to get enum types
                   printed.  There's no other way to see them.  */
-               c_print_type_1 (TYPE_FIELD_TYPE (type, i),
+               c_print_type_1 (type->field (i).type (),
                                TYPE_FIELD_NAME (type, i),
                                stream, show, level + 4,
                                language, &local_flags, podata);