[PATCH v2 14/17] gdb: convert TYPE_RESTRICT macro to type::is_restrict

Convert the TYPE_RESTRICT macro to a method of the type class.  This
is a refactoring.
---
 gdb/c-typeprint.c                 | 4 ++--
 gdb/compile/compile-c-types.c     | 4 ++--
 gdb/compile/compile-cplus-types.c | 6 +++---
 gdb/gdbtypes.c                    | 6 ++----
 gdb/gdbtypes.h                    | 7 ++++++-
 5 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index d26640e10e6..1c3b0fba04d 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -317,7 +317,7 @@ cp_type_print_method_args (struct type *mtype,
       if (domain->is_volatile ())
 	gdb_printf (stream, " volatile");
 
-      if (TYPE_RESTRICT (domain))
+      if (domain->is_restrict ())
 	gdb_printf (stream, (language == language_cplus
 			     ? " __restrict__"
 			     : " restrict"));
@@ -465,7 +465,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
       did_print_modifier = 1;
     }
 
-  if (TYPE_RESTRICT (type))
+  if (type->is_restrict ())
     {
       if (did_print_modifier || need_pre_space)
 	gdb_printf (stream, " ");
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index 2c115632a7c..818cdecd50d 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -251,7 +251,7 @@ convert_qualified (compile_c_instance *context, struct type *type)
     quals |= GCC_QUALIFIER_CONST;
   if (type->is_volatile ())
     quals |= GCC_QUALIFIER_VOLATILE;
-  if (TYPE_RESTRICT (type))
+  if (type->is_restrict ())
     quals |= GCC_QUALIFIER_RESTRICT;
 
   return context->plugin ().build_qualified_type (unqual_converted,
@@ -278,7 +278,7 @@ convert_type_basic (compile_c_instance *context, struct type *type)
 {
   /* If we are converting a qualified type, first convert the
      unqualified type and then apply the qualifiers.  */
-  if (type->is_const () || type->is_volatile () || TYPE_RESTRICT (type))
+  if (type->is_const () || type->is_volatile () || type->is_restrict ())
     return convert_qualified (context, type);
 
   switch (type->code ())
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-types.c
index 787ca321a5f..8352c9324f4 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -673,7 +673,7 @@ compile_cplus_convert_method (compile_cplus_instance *instance,
     quals |= GCC_CP_QUALIFIER_CONST;
   if (method_type->is_volatile ())
     quals |= GCC_CP_QUALIFIER_VOLATILE;
-  if (TYPE_RESTRICT (method_type))
+  if (method_type->is_restrict ())
     quals |= GCC_CP_QUALIFIER_RESTRICT;
 
   /* Not yet implemented.  */
@@ -1070,7 +1070,7 @@ compile_cplus_convert_qualified (compile_cplus_instance *instance,
     quals |= GCC_CP_QUALIFIER_CONST;
   if (type->is_volatile ())
     quals |= GCC_CP_QUALIFIER_VOLATILE;
-  if (TYPE_RESTRICT (type))
+  if (type->is_restrict ())
     quals |= GCC_CP_QUALIFIER_RESTRICT;
 
   return instance->convert_qualified_base (unqual_converted, quals);
@@ -1126,7 +1126,7 @@ convert_type_cplus_basic (compile_cplus_instance *instance,
 {
   /* If we are converting a qualified type, first convert the
      unqualified type and then apply the qualifiers.  */
-  if (type->is_const () || type->is_volatile () || TYPE_RESTRICT (type))
+  if (type->is_const () || type->is_volatile () || type->is_restrict ())
     return compile_cplus_convert_qualified (instance, type);
 
   switch (type->code ())
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 731c7436dc6..a682d525134 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -5033,10 +5033,8 @@ recursive_dump_type (struct type *type, int spaces)
     {
       gdb_printf (" TYPE_ADDRESS_CLASS(%u)", TYPE_ADDRESS_CLASS (type));
     }
-  if (TYPE_RESTRICT (type))
-    {
-      gdb_puts (" TYPE_RESTRICT");
-    }
+  if (type->is_restrict ())
+    gdb_puts (" TYPE_RESTRICT");
   if (TYPE_ATOMIC (type))
     {
       gdb_puts (" TYPE_ATOMIC");
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index b6c3b219419..0acfda0d74b 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -168,7 +168,6 @@ struct type_instance_flags
   bool is_atomic : 1;
 };
 
-#define TYPE_RESTRICT(t) (((t)->instance_flags ()).is_restrict)
 #define TYPE_ATOMIC(t) (((t)->instance_flags ()).is_atomic)
 
 /* True if this type represents either an lvalue or lvalue reference type.  */
@@ -1222,6 +1221,12 @@ struct type
     return this->m_instance_flags.harvard_aspace == HARVARD_ASPACE_DATA;
   }
 
+  /* Return if this type is restrict.  */
+  bool is_restrict () const
+  {
+    return this->m_instance_flags.is_restrict;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  */
   range_bounds *bounds () const
   {

-- 
2.34.1