[PATCH 10/12] gdb: remove TYPE_FIELD_STATIC_PHYSNAME

[Simon Marchi]

From: Simon Marchi <simon.marchi@polymtl.ca>

Remove TYPE_FIELD_STATIC_PHYSNAME, replace with type::field +
field::loc_physname.

Change-Id: Ie35d446b67dd1d02f39998b406001bdb7e6d5abb
---
 gdb/ax-gdb.c                      | 2 +-
 gdb/compile/compile-cplus-types.c | 2 +-
 gdb/gdbtypes.c                    | 2 +-
 gdb/gdbtypes.h                    | 1 -
 gdb/value.c                       | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gdb/ax-gdb.c b/gdb/ax-gdb.c
index b56652a7a25..beeee65fe43 100644
--- a/gdb/ax-gdb.c
+++ b/gdb/ax-gdb.c
@@ -1447,7 +1447,7 @@ gen_static_field (struct agent_expr *ax, struct axs_value *value,
     }
   else
     {
-      const char *phys_name = TYPE_FIELD_STATIC_PHYSNAME (type, fieldno);
+      const char *phys_name = type->field (fieldno).loc_physname ();
       struct symbol *sym = lookup_symbol (phys_name, 0, VAR_DOMAIN, 0).symbol;
 
       if (sym)
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 1bd083df870..31634a9ca92 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -614,7 +614,7 @@ compile_cplus_convert_struct_or_union_members
 
 	    case FIELD_LOC_KIND_PHYSNAME:
 	      {
-		const char *physname = TYPE_FIELD_STATIC_PHYSNAME (type, i);
+		const char *physname = type->field (i).loc_physname ();
 		struct block_symbol sym
 		  = lookup_symbol (physname, instance->block (),
 				   VAR_DOMAIN, nullptr);
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index d937d234026..d6b2772269e 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -5573,7 +5573,7 @@ copy_type_recursive (struct objfile *objfile,
 	      break;
 	    case FIELD_LOC_KIND_PHYSNAME:
 	      new_type->field (i).set_loc_physname
-		(xstrdup (TYPE_FIELD_STATIC_PHYSNAME (type, i)));
+		(xstrdup (type->field (i).loc_physname ()));
 	      break;
             case FIELD_LOC_KIND_DWARF_BLOCK:
               new_type->field (i).set_loc_dwarf_block
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 63accb7ca0e..b9b6e61630c 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_STATIC_PHYSNAME(thistype, n) ((thistype)->field (n).loc_physname ())
 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) ((thistype)->field (n).loc_physaddr ())
 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) ((thistype)->field (n).loc_dwarf_block ())
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n))
diff --git a/gdb/value.c b/gdb/value.c
index 9d83a53aa5d..3643662ebd7 100644
--- a/gdb/value.c
+++ b/gdb/value.c
@@ -2949,7 +2949,7 @@ value_static_field (struct type *type, int fieldno)
       break;
     case FIELD_LOC_KIND_PHYSNAME:
     {
-      const char *phys_name = TYPE_FIELD_STATIC_PHYSNAME (type, fieldno);
+      const char *phys_name = type->field (fieldno).loc_physname ();
       /* type->field (fieldno).name (); */
       struct block_symbol sym = lookup_symbol (phys_name, 0, VAR_DOMAIN, 0);
 
-- 
2.33.0