[PATCH v2 16/17] gdb: convert TYPE_ADDRESS_CLASS macro to type::address_class

Convert the TYPE_ADDRESS_CLASS macro to a method of the type class.  This
is a refactoring.
---
 gdb/avr-tdep.c    | 4 ++--
 gdb/c-typeprint.c | 2 +-
 gdb/ft32-tdep.c   | 2 +-
 gdb/gdbtypes.c    | 8 +++-----
 gdb/gdbtypes.h    | 9 ++++++---
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/gdb/avr-tdep.c b/gdb/avr-tdep.c
index 682b7e8586d..012022f2b73 100644
--- a/gdb/avr-tdep.c
+++ b/gdb/avr-tdep.c
@@ -305,7 +305,7 @@ avr_address_to_pointer (struct gdbarch *gdbarch,
   enum bfd_endian byte_order = gdbarch_byte_order (gdbarch);
 
   /* Is it a data address in flash?  */
-  if (TYPE_ADDRESS_CLASS (type) == AVR_ADDRESS_CLASS_FLASH)
+  if (type->address_class () == AVR_ADDRESS_CLASS_FLASH)
     {
       /* A data pointer in flash is byte addressed.  */
       store_unsigned_integer (buf, type->length (), byte_order,
@@ -337,7 +337,7 @@ avr_pointer_to_address (struct gdbarch *gdbarch,
     = extract_unsigned_integer (buf, type->length (), byte_order);
 
   /* Is it a data address in flash?  */
-  if (TYPE_ADDRESS_CLASS (type) == AVR_ADDRESS_CLASS_FLASH)
+  if (type->address_class () == AVR_ADDRESS_CLASS_FLASH)
     {
       /* A data pointer in flash is already byte addressed.  */
       return avr_make_iaddr (addr);
diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 92938270647..07f01c92b15 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -492,7 +492,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
   else if (gdbarch_address_class_id_to_name_p (type->arch ()))
     address_space_id
       = gdbarch_address_class_id_to_name (type->arch (),
-					  TYPE_ADDRESS_CLASS (type));
+					  type->address_class ());
 
   if (address_space_id != nullptr)
     {
diff --git a/gdb/ft32-tdep.c b/gdb/ft32-tdep.c
index f951a6f25e3..38b4784ed35 100644
--- a/gdb/ft32-tdep.c
+++ b/gdb/ft32-tdep.c
@@ -332,7 +332,7 @@ ft32_pointer_to_address (struct gdbarch *gdbarch,
   CORE_ADDR addr
     = extract_unsigned_integer (buf, type->length (), byte_order);
 
-  if (TYPE_ADDRESS_CLASS (type) == 1)
+  if (type->address_class () == 1)
     return addr;
   else
     return addr | RAM_BIAS;
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 34eaac42e20..f9764fb1da3 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -710,7 +710,7 @@ replace_type (struct type *ntype, struct type *type)
 	 variants.  This assertion shouldn't ever be triggered because
 	 symbol readers which do construct address-class variants don't
 	 call replace_type().  */
-      gdb_assert (TYPE_ADDRESS_CLASS (chain) == 0);
+      gdb_assert (chain->address_class () == 0);
 
       chain->set_length (type->length ());
       chain = chain->chain;
@@ -5029,10 +5029,8 @@ recursive_dump_type (struct type *type, int spaces)
     gdb_puts (" TYPE_CODE_SPACE");
   if (type->is_data_space ())
     gdb_puts (" TYPE_DATA_SPACE");
-  if (TYPE_ADDRESS_CLASS (type) != 0)
-    {
-      gdb_printf (" TYPE_ADDRESS_CLASS(%u)", TYPE_ADDRESS_CLASS (type));
-    }
+  if (type->address_class () != 0)
+    gdb_printf (" TYPE_ADDRESS_CLASS(%u)", type->address_class ());
   if (type->is_restrict ())
     gdb_puts (" TYPE_RESTRICT");
   if (type->is_atomic ())
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 624d468e4f2..ecd71f96497 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -186,9 +186,6 @@ struct type_instance_flags
   (((t)->dyn_prop (DYN_PROP_BYTE_SIZE) != nullptr)	\
    || ((t)->dyn_prop (DYN_PROP_BIT_SIZE) != nullptr))
 
-#define TYPE_ADDRESS_CLASS(t) \
-  (((t)->instance_flags ()).address_class)
-
 /* Information about a single discriminant.  */
 
 struct discriminant_range
@@ -1231,6 +1228,12 @@ struct type
     return this->m_instance_flags.is_atomic;
   }
 
+  /* Return the address class of this type.  */
+  unsigned int address_class () const
+  {
+    return this->m_instance_flags.address_class;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  */
   range_bounds *bounds () const
   {

-- 
2.34.1