gdb: remove TYPE_FIELD_TYPE macro

[deliverable/binutils-gdb.git] / gdb / i386-windows-tdep.c

diff --git a/gdb/i386-windows-tdep.c b/gdb/i386-windows-tdep.c
index 4824a9e5528d6c7f47b72817d2a09db4b2076f07..ae61ed8291cd0e26dfb7abcdc049b84c6f5b941a 100644 (file)
--- a/gdb/i386-windows-tdep.c
+++ b/gdb/i386-windows-tdep.c
@@ -142,8 +142,7 @@ core_process_module_section (bfd *abfd, asection *sect, void *obj)
   data->module_count++;
 
 out:
-  if (buf)
-    xfree (buf);
+  xfree (buf);
   return;
 }
 
@@ -214,15 +213,15 @@ i386_windows_push_dummy_call (struct gdbarch *gdbarch, struct value *function,
   bool thiscall = false;
 
   struct type *type = check_typedef (value_type (function));
-  if (TYPE_CODE (type) == TYPE_CODE_PTR)
+  if (type->code () == TYPE_CODE_PTR)
     type = check_typedef (TYPE_TARGET_TYPE (type));
 
   /* read_subroutine_type sets for non-static member functions the
      artificial flag of the first parameter ('this' pointer).  */
-  if (TYPE_CODE (type) == TYPE_CODE_METHOD
-      && TYPE_NFIELDS (type) > 0
+  if (type->code () == TYPE_CODE_METHOD
+      && type->num_fields () > 0
       && TYPE_FIELD_ARTIFICIAL (type, 0)
-      && TYPE_CODE (TYPE_FIELD_TYPE (type, 0)) == TYPE_CODE_PTR)
+      && type->field (0).type ()->code () == TYPE_CODE_PTR)
     thiscall = 1;
 
   return i386_thiscall_push_dummy_call (gdbarch, function, regcache, bp_addr,