gdb: convert TYPE_VOLATILE macro to type::is_volatile

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

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

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index 97e547a92ef1fa0195772378674197a303e783e8..fb8b228ea3875d0c01cf1c2a0862788355af02ef 100644 (file)
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -314,7 +314,7 @@ cp_type_print_method_args (struct type *mtype,
       if (domain->is_const ())
        gdb_printf (stream, " const");
 
-      if (TYPE_VOLATILE (domain))
+      if (domain->is_volatile ())
        gdb_printf (stream, " volatile");
 
       if (TYPE_RESTRICT (domain))
@@ -457,7 +457,7 @@ c_type_print_modifier (struct type *type, struct ui_file *stream,
       did_print_modifier = 1;
     }
 
-  if (TYPE_VOLATILE (type))
+  if (type->is_volatile ())
     {
       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 2e5ca12a61b6ca7b0423d371ff37510ddcd1091b..2c115632a7c2e35c06ef9e078697f8a8a5981c8a 100644 (file)
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -249,7 +249,7 @@ convert_qualified (compile_c_instance *context, struct type *type)
 
   if (type->is_const ())
     quals |= GCC_QUALIFIER_CONST;
-  if (TYPE_VOLATILE (type))
+  if (type->is_volatile ())
     quals |= GCC_QUALIFIER_VOLATILE;
   if (TYPE_RESTRICT (type))
     quals |= GCC_QUALIFIER_RESTRICT;
@@ -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_VOLATILE (type) || TYPE_RESTRICT (type))
+  if (type->is_const () || type->is_volatile () || TYPE_RESTRICT (type))
     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 90ef1bda2cbb0532e00d6b4c4259463e92826378..787ca321a5fcfbd314aed1380d892825e726f6b1 100644 (file)
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -671,7 +671,7 @@ compile_cplus_convert_method (compile_cplus_instance *instance,
 
   if (method_type->is_const ())
     quals |= GCC_CP_QUALIFIER_CONST;
-  if (TYPE_VOLATILE (method_type))
+  if (method_type->is_volatile ())
     quals |= GCC_CP_QUALIFIER_VOLATILE;
   if (TYPE_RESTRICT (method_type))
     quals |= GCC_CP_QUALIFIER_RESTRICT;
@@ -1068,7 +1068,7 @@ compile_cplus_convert_qualified (compile_cplus_instance *instance,
 
   if (type->is_const ())
     quals |= GCC_CP_QUALIFIER_CONST;
-  if (TYPE_VOLATILE (type))
+  if (type->is_volatile ())
     quals |= GCC_CP_QUALIFIER_VOLATILE;
   if (TYPE_RESTRICT (type))
     quals |= GCC_CP_QUALIFIER_RESTRICT;
@@ -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_VOLATILE (type) || TYPE_RESTRICT (type))
+  if (type->is_const () || type->is_volatile () || TYPE_RESTRICT (type))
     return compile_cplus_convert_qualified (instance, type);
 
   switch (type->code ())

diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index b40d3de6763bba09ba849263d7b5a7650af40c8a..ff34f42146a8265391174613c0e4b0b74035ea59 100644 (file)
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -758,7 +758,7 @@ add_array_cv_type (struct ctf_context *ccp,
 
   el_type = inner_array->target_type ();
   cnst |= el_type->is_const ();
-  voltl |= TYPE_VOLATILE (el_type);
+  voltl |= el_type->is_volatile ();
   inner_array->set_target_type (make_cv_type (cnst, voltl, el_type));
 
   return set_tid_type (ccp, tid, base_type);
@@ -830,7 +830,7 @@ read_const_type (struct ctf_context *ccp, ctf_id_t tid, ctf_id_t btid)
          base_type = builtin_type (objfile)->builtin_error;
        }
     }
-  cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type);
+  cv_type = make_cv_type (1, base_type->is_volatile (), base_type);
 
   return set_tid_type (ccp, tid, cv_type);
 }

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 067561b6e4840c995d158cead3bb00c3e694af3d..38c498b19016232e3a7b869c029c88967df4c22f 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -12177,7 +12177,7 @@ add_array_cv_type (struct die_info *die, struct dwarf2_cu *cu,
 
   el_type = inner_array->target_type ();
   cnst |= el_type->is_const ();
-  voltl |= TYPE_VOLATILE (el_type);
+  voltl |= el_type->is_volatile ();
   inner_array->set_target_type (make_cv_type (cnst, voltl, el_type));
 
   return set_die_type (die, base_type, cu);
@@ -12200,7 +12200,7 @@ read_tag_const_type (struct die_info *die, struct dwarf2_cu *cu)
   if (base_type->code () == TYPE_CODE_ARRAY)
     return add_array_cv_type (die, cu, base_type, 1, 0);
 
-  cv_type = make_cv_type (1, TYPE_VOLATILE (base_type), base_type);
+  cv_type = make_cv_type (1, base_type->is_volatile (), base_type);
   return set_die_type (die, cv_type, cu);
 }
 
@@ -12545,7 +12545,7 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu)
                    is_this = 1;
 
                  if (is_this)
-                   arg_type = make_cv_type (1, TYPE_VOLATILE (arg_type),
+                   arg_type = make_cv_type (1, arg_type->is_volatile (),
                                             arg_type);
                }
 

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 74b043de9f9353e3d3d677a71fa9cf42905e68af..1019f02e2e180325811b97447a4270534095a50e 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4316,7 +4316,7 @@ rank_one_type_parm_ptr (struct type *parm, struct type *arg, struct value *value
            /* Make sure they are CV equal.  */
            if (t1->is_const () != t2->is_const ())
              rank.subrank |= CV_CONVERSION_CONST;
-           if (TYPE_VOLATILE (t1) != TYPE_VOLATILE (t2))
+           if (t1->is_volatile () != t2->is_volatile ())
              rank.subrank |= CV_CONVERSION_VOLATILE;
            if (rank.subrank != 0)
              return sum_ranks (CV_CONVERSION_BADNESS, rank);
@@ -4729,7 +4729,7 @@ rank_one_type (struct type *parm, struct type *arg, struct value *value)
       /* Make sure they are CV equal, too.  */
       if (t1->is_const () != t2->is_const ())
        rank.subrank |= CV_CONVERSION_CONST;
-      if (TYPE_VOLATILE (t1) != TYPE_VOLATILE (t2))
+      if (t1->is_volatile () != t2->is_volatile ())
        rank.subrank |= CV_CONVERSION_VOLATILE;
       if (rank.subrank != 0)
        return sum_ranks (CV_CONVERSION_BADNESS, rank);
@@ -5023,10 +5023,8 @@ recursive_dump_type (struct type *type, int spaces)
   gdb_printf ("%*sinstance_flags [", spaces, "");
   if (type->is_const ())
     gdb_puts (" TYPE_CONST");
-  if (TYPE_VOLATILE (type))
-    {
-      gdb_puts (" TYPE_VOLATILE");
-    }
+  if (type->is_volatile ())
+    gdb_puts (" TYPE_VOLATILE");
   if (TYPE_CODE_SPACE (type))
     {
       gdb_puts (" TYPE_CODE_SPACE");

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index a4fcd4d07b42b1e80d33cd0e0c62d08be5a0a0af..6a8bc425d4519a9558ca20a7cc2c9c1865311e4a 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -168,7 +168,6 @@ struct type_instance_flags
   bool is_atomic : 1;
 };
 
-#define TYPE_VOLATILE(t) (((t)->instance_flags ()).is_volatile)
 #define TYPE_RESTRICT(t) (((t)->instance_flags ()).is_restrict)
 #define TYPE_ATOMIC(t) (((t)->instance_flags ()).is_atomic)
 
@@ -1211,6 +1210,12 @@ struct type
     return this->m_instance_flags.is_const;
   }
 
+  /* Return if this type is volatile.  */
+  bool is_volatile () const
+  {
+    return this->m_instance_flags.is_volatile;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  */
   range_bounds *bounds () const
   {

diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 96119785f925f2ddd919989d30861d95a15de8df..895f7a41f0135317c2c634582d01e20dc560dde9 100644 (file)
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -292,7 +292,7 @@ create_value (struct gdbarch *gdbarch, struct value *val, enum noside noside,
       if (dst_type == NULL)
        dst_type = init_vector_type (elm_type, n);
 
-      make_cv_type (type->is_const (), TYPE_VOLATILE (type), dst_type);
+      make_cv_type (type->is_const (), type->is_volatile (), dst_type);
 
       if (noside == EVAL_AVOID_SIDE_EFFECTS)
        ret = value::allocate (dst_type);

diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 5b98ec1fa7f0c1cdd2d9b330921cf76f915c8d32..9dd0fe2ab37f03ac7ad1bbb539685592f5009413 100644 (file)
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -715,7 +715,7 @@ typy_const (PyObject *self, PyObject *args)
 
   try
     {
-      type = make_cv_type (1, TYPE_VOLATILE (type), type);
+      type = make_cv_type (1, type->is_volatile (), type);
     }
   catch (const gdb_exception &except)
     {
@@ -891,7 +891,7 @@ typy_lookup_type (struct demangle_component *demangled,
              rtype = lookup_pointer_type (type);
              break;
            case DEMANGLE_COMPONENT_CONST:
-             rtype = make_cv_type (1, TYPE_VOLATILE (type), type);
+             rtype = make_cv_type (1, type->is_volatile (), type);
              break;
            case DEMANGLE_COMPONENT_VOLATILE:
              rtype = make_cv_type (type->is_const (), 1, type);

diff --git a/gdb/type-stack.c b/gdb/type-stack.c
index 05c5ee6e47f549b1f22cb5cd3bad2edbb55c1b23..01616ae4a140542f8acd3c9665a83366c6ca4329 100644 (file)
--- a/gdb/type-stack.c
+++ b/gdb/type-stack.c
@@ -156,7 +156,7 @@ type_stack::follow_types (struct type *follow_type)
       process_qualifiers:
        if (make_const)
          follow_type = make_cv_type (make_const,
-                                     TYPE_VOLATILE (follow_type),
+                                     follow_type->is_volatile (),
                                      follow_type);
        if (make_volatile)
          follow_type = make_cv_type (follow_type->is_const (),

diff --git a/gdb/valops.c b/gdb/valops.c
index ccb2ae21adccf4f0e2bff8ed1c907f62a88dac1c..d2dc3d9e8691388529f9b6534e1de29a43170ef1 100644 (file)
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3652,7 +3652,7 @@ value_struct_elt_for_reference (struct type *domain, int offset,
                {
                  if (intype->is_const () != TYPE_FN_FIELD_CONST (f, j))
                    continue;
-                 if (TYPE_VOLATILE (intype) != TYPE_FN_FIELD_VOLATILE (f, j))
+                 if (intype->is_volatile () != TYPE_FN_FIELD_VOLATILE (f, j))
                    continue;
 
                  if (compare_parameters (TYPE_FN_FIELD_TYPE (f, j), intype, 0)
@@ -3874,7 +3874,7 @@ value_rtti_indirect_type (struct value *v, int *full,
       /* Copy qualifiers to the referenced object.  */
       target_type = target->type ();
       real_type = make_cv_type (target_type->is_const (),
-                               TYPE_VOLATILE (target_type), real_type);
+                               target_type->is_volatile (), real_type);
       if (TYPE_IS_REFERENCE (type))
        real_type = lookup_reference_type (real_type, type->code ());
       else if (type->code () == TYPE_CODE_PTR)
@@ -3883,7 +3883,7 @@ value_rtti_indirect_type (struct value *v, int *full,
        internal_error (_("Unexpected value type."));
 
       /* Copy qualifiers to the pointer/reference.  */
-      real_type = make_cv_type (type->is_const (), TYPE_VOLATILE (type),
+      real_type = make_cv_type (type->is_const (), type->is_volatile (),
                                real_type);
     }