From: Simon Marchi <simon.marchi@polymtl.ca>
Date: Mon, 27 Sep 2021 01:08:36 +0000 (-0400)
Subject: gdb: remove TYPE_FIELD_DWARF_BLOCK
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=51e36a3aaada574336217a83aaeba32424eee537;p=binutils-gdb.git

gdb: remove TYPE_FIELD_DWARF_BLOCK

Remove TYPE_FIELD_DWARF_BLOCK, replace with type::field +
field::loc_dwarf_block.

Change-Id: I10af9410bb5f46d342b8358a7956998c7e804b64
---

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 75214896509..00934d9a4bc 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -2591,7 +2591,7 @@ resolve_dynamic_struct (struct type *type,
 	  struct dwarf2_property_baton baton;
 	  baton.property_type
 	    = lookup_pointer_type (resolved_type->field (i).type ());
-	  baton.locexpr = *TYPE_FIELD_DWARF_BLOCK (resolved_type, i);
+	  baton.locexpr = *resolved_type->field (i).loc_dwarf_block ();
 
 	  struct dynamic_prop prop;
 	  prop.set_locexpr (&baton);
@@ -5577,7 +5577,7 @@ copy_type_recursive (struct objfile *objfile,
 	      break;
             case FIELD_LOC_KIND_DWARF_BLOCK:
               new_type->field (i).set_loc_dwarf_block
-		(TYPE_FIELD_DWARF_BLOCK (type, i));
+		(type->field (i).loc_dwarf_block ());
               break;
 	    default:
 	      internal_error (__FILE__, __LINE__,
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 1f5dc657b1c..5284a4c3a03 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2128,7 +2128,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial)
 #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize)
 
-#define TYPE_FIELD_DWARF_BLOCK(thistype, n) ((thistype)->field (n).loc_dwarf_block ())
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n))
 #define TYPE_FIELD_BITSIZE(thistype, n) FIELD_BITSIZE((thistype)->field (n))
 #define TYPE_FIELD_PACKED(thistype, n) (FIELD_BITSIZE((thistype)->field (n))!=0)
diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c
index 80b7eddd878..187c10595ac 100644
--- a/gdb/gnu-v3-abi.c
+++ b/gdb/gnu-v3-abi.c
@@ -469,7 +469,7 @@ gnuv3_baseclass_offset (struct type *type, int index,
       struct dwarf2_property_baton baton;
       baton.property_type
 	= lookup_pointer_type (type->field (index).type ());
-      baton.locexpr = *TYPE_FIELD_DWARF_BLOCK (type, index);
+      baton.locexpr = *type->field (index).loc_dwarf_block ();
 
       struct dynamic_prop prop;
       prop.set_locexpr (&baton);