gdb: remove FIELD_STATIC_PHYSNAME macro

Remove FIELD_STATIC_PHYSNAME, replace its uses with field::loc_physname.

Change-Id: Iaa8952410403b4eb5bbd68411feea27e2405d657

diff --git a/gdb/dwarf2/loc.c b/gdb/dwarf2/loc.c
index 1054b0182e10fbfe2757437114e9f80cebc80569..9d9267b7c69359809a8e739c7a91a77b79277814 100644 (file)
--- a/gdb/dwarf2/loc.c
+++ b/gdb/dwarf2/loc.c
@@ -694,7 +694,7 @@ call_site_to_target_addr (struct gdbarch *call_site_gdbarch,
        const char *physname;
        struct bound_minimal_symbol msym;
 
-       physname = FIELD_STATIC_PHYSNAME (call_site->target);
+       physname = call_site->target.loc_physname ();
 
        /* Handle both the mangled and demangled PHYSNAME.  */
        msym = lookup_minimal_symbol (physname, NULL, NULL);

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index adaaa30647fc6b8a33a0e62b7ea152b1e709086b..14bc546df023ec6da5433ee13ebd7ff8c82450e5 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4226,8 +4226,8 @@ check_types_equal (struct type *type1, struct type *type2,
                return false;
              break;
            case FIELD_LOC_KIND_PHYSNAME:
-             if (!compare_maybe_null_strings (FIELD_STATIC_PHYSNAME (*field1),
-                                              FIELD_STATIC_PHYSNAME (*field2)))
+             if (!compare_maybe_null_strings (field1->loc_physname (),
+                                              field2->loc_physname ()))
                return false;
              break;
            case FIELD_LOC_KIND_DWARF_BLOCK:

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index a84b3bc93fc5a754362909cc4580de14ac03dabc..8af7bab9bf5daf2330a304d404b21dc94a0e4960 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -2125,7 +2125,6 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
   (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \
     : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (index)))
 
-#define FIELD_STATIC_PHYSNAME(thisfld) ((thisfld).loc_physname ())
 #define FIELD_STATIC_PHYSADDR(thisfld) ((thisfld).loc_physaddr ())
 #define FIELD_DWARF_BLOCK(thisfld) ((thisfld).loc_dwarf_block ())
 #define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial)
@@ -2134,7 +2133,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
 #define TYPE_FIELD_LOC_KIND(thistype, n) ((thistype)->field (n).loc_kind ())
 #define TYPE_FIELD_BITPOS(thistype, n) ((thistype)->field (n).loc_bitpos ())
 #define TYPE_FIELD_ENUMVAL(thistype, n) ((thistype)->field (n).loc_enumval ())
-#define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_STATIC_PHYSNAME ((thistype)->field (n))
+#define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) ((thistype)->field (n).loc_physname ())
 #define TYPE_FIELD_STATIC_PHYSADDR(thistype, n) FIELD_STATIC_PHYSADDR ((thistype)->field (n))
 #define TYPE_FIELD_DWARF_BLOCK(thistype, n) FIELD_DWARF_BLOCK ((thistype)->field (n))
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n))