gdb: convert TYPE_NOTTEXT macro to type::is_nottext

Convert the TYPE_NOTTEXT macro to a method of the type class.  This is
a refactoring.

Approved-By: Tom Tromey <tom@tromey.com>

diff --git a/gdb/c-valprint.c b/gdb/c-valprint.c
index 9f9f61ea2e0d12fc4b9ba07bcab8be6a3005e56f..2ee65c4106156c4a82f800c408f54f77c3d7cf3f 100644 (file)
--- a/gdb/c-valprint.c
+++ b/gdb/c-valprint.c
@@ -109,7 +109,7 @@ c_textual_element_type (struct type *type, char format)
         being used as data.  */
       if (true_type->code () == TYPE_CODE_INT
          && true_type->length () == 1
-         && !TYPE_NOTTEXT (true_type))
+         && !true_type->is_nottext ())
        return 1;
     }
 

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index a866f36d1ea5c77b5e669ccc106808bbe6deb0ba..dd73d9e624fb555ec7f193f74ce1f5b5d930a325 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4126,7 +4126,7 @@ check_types_equal (struct type *type1, struct type *type2,
       || type1->endianity_is_not_default () != type2->endianity_is_not_default ()
       || type1->has_varargs () != type2->has_varargs ()
       || type1->is_vector () != type2->is_vector ()
-      || TYPE_NOTTEXT (type1) != TYPE_NOTTEXT (type2)
+      || type1->is_nottext () != type2->is_nottext ()
       || type1->instance_flags () != type2->instance_flags ()
       || type1->num_fields () != type2->num_fields ())
     return false;
@@ -5091,10 +5091,8 @@ recursive_dump_type (struct type *type, int spaces)
     {
       gdb_puts (" TYPE_FIXED_INSTANCE");
     }
-  if (TYPE_NOTTEXT (type))
-    {
-      gdb_puts (" TYPE_NOTTEXT");
-    }
+  if (type->is_nottext ())
+    gdb_puts (" TYPE_NOTTEXT");
   gdb_puts ("\n");
   gdb_printf ("%*snfields %d ", spaces, "", type->num_fields ());
   if (type->dyn_prop (DYN_PROP_ASSOCIATED) != nullptr

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 11a08428bafcc8c8449cb3908f562e52883bc6be..176d393666142983723db8eaf68dec7c2d7859f6 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -168,7 +168,6 @@ struct type_instance_flags
   bool is_atomic : 1;
 };
 
-#define TYPE_NOTTEXT(t)        (((t)->instance_flags ()).is_nottext)
 #define TYPE_CONST(t) (((t)->instance_flags ()).is_const)
 #define TYPE_VOLATILE(t) (((t)->instance_flags ()).is_volatile)
 #define TYPE_RESTRICT(t) (((t)->instance_flags ()).is_restrict)
@@ -1201,6 +1200,12 @@ struct type
     this->m_instance_flags.is_nottext = flag;
   }
 
+  /* Return if this type is nottext.  */
+  bool is_nottext () const
+  {
+    return this->m_instance_flags.is_nottext;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  */
   range_bounds *bounds () const
   {