[binutils-gdb] gdb: convert TYPE_CONST macro to type::is_const

https://sourceware.org/git/gitweb.cgi?p=3Dbinutils-gdb.git;h=3Dca1609e0c757=
41eeef347a5f7bb60464a639da55

commit ca1609e0c75741eeef347a5f7bb60464a639da55
Author: Tankut Baris Aktemur <[email protected]>
Date:   Thu Jul 23 05:04:43 2026 -0500

    gdb: convert TYPE_CONST macro to type::is_const
   =20
    Convert the TYPE_CONST macro to a method of the type class.  This is
    a refactoring.
   =20
    Approved-By: Tom Tromey <[email protected]>

Diff:
---
 gdb/c-typeprint.c                 |  4 ++--
 gdb/compile/compile-c-types.c     |  4 ++--
 gdb/compile/compile-cplus-types.c |  6 +++---
 gdb/ctfread.c                     |  4 ++--
 gdb/dwarf2/read.c                 |  8 ++++----
 gdb/gdbtypes.c                    | 12 +++++-------
 gdb/gdbtypes.h                    |  7 ++++++-
 gdb/m2-typeprint.c                |  2 +-
 gdb/m2-valprint.c                 |  2 +-
 gdb/opencl-lang.c                 |  2 +-
 gdb/python/py-type.c              |  4 ++--
 gdb/type-stack.c                  |  2 +-
 gdb/valops.c                      |  6 +++---
 13 files changed, 33 insertions(+), 30 deletions(-)

diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c
index db3bc29475f..97e547a92ef 100644
--- a/gdb/c-typeprint.c
+++ b/gdb/c-typeprint.c
@@ -311,7 +311,7 @@ cp_type_print_method_args (struct type *mtype,
       gdb_assert (args[0].type ()->code () =3D=3D TYPE_CODE_PTR);
       domain =3D args[0].type ()->target_type ();
=20
-      if (TYPE_CONST (domain))
+      if (domain->is_const ())
 	gdb_printf (stream, " const");
=20
       if (TYPE_VOLATILE (domain))
@@ -449,7 +449,7 @@ c_type_print_modifier (struct type *type, struct ui_fil=
e *stream,
   /* We don't print `const' qualifiers for references --- since all
      operators affect the thing referenced, not the reference itself,
      every reference is `const'.  */
-  if (TYPE_CONST (type) && !TYPE_IS_REFERENCE (type))
+  if (type->is_const () && !TYPE_IS_REFERENCE (type))
     {
       if (need_pre_space)
 	gdb_printf (stream, " ");
diff --git a/gdb/compile/compile-c-types.c b/gdb/compile/compile-c-types.c
index af9dea730eb..2e5ca12a61b 100644
--- a/gdb/compile/compile-c-types.c
+++ b/gdb/compile/compile-c-types.c
@@ -247,7 +247,7 @@ convert_qualified (compile_c_instance *context, struct =
type *type)
=20
   unqual_converted =3D context->convert_type (unqual);
=20
-  if (TYPE_CONST (type))
+  if (type->is_const ())
     quals |=3D GCC_QUALIFIER_CONST;
   if (TYPE_VOLATILE (type))
     quals |=3D GCC_QUALIFIER_VOLATILE;
@@ -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_CONST (type) || TYPE_VOLATILE (type) || TYPE_RESTRICT (type))
+  if (type->is_const () || TYPE_VOLATILE (type) || TYPE_RESTRICT (type))
     return convert_qualified (context, type);
=20
   switch (type->code ())
diff --git a/gdb/compile/compile-cplus-types.c b/gdb/compile/compile-cplus-=
types.c
index ff25fc62c8b..90ef1bda2cb 100644
--- a/gdb/compile/compile-cplus-types.c
+++ b/gdb/compile/compile-cplus-types.c
@@ -669,7 +669,7 @@ compile_cplus_convert_method (compile_cplus_instance *i=
nstance,
   gcc_type class_type =3D instance->convert_type (parent_type);
   gcc_cp_qualifiers_flags quals =3D 0;
=20
-  if (TYPE_CONST (method_type))
+  if (method_type->is_const ())
     quals |=3D GCC_CP_QUALIFIER_CONST;
   if (TYPE_VOLATILE (method_type))
     quals |=3D GCC_CP_QUALIFIER_VOLATILE;
@@ -1066,7 +1066,7 @@ compile_cplus_convert_qualified (compile_cplus_instan=
ce *instance,
   gcc_cp_qualifiers_flags quals =3D (enum gcc_cp_qualifiers) 0;
   gcc_type unqual_converted =3D instance->convert_type (unqual);
=20
-  if (TYPE_CONST (type))
+  if (type->is_const ())
     quals |=3D GCC_CP_QUALIFIER_CONST;
   if (TYPE_VOLATILE (type))
     quals |=3D GCC_CP_QUALIFIER_VOLATILE;
@@ -1126,7 +1126,7 @@ convert_type_cplus_basic (compile_cplus_instance *ins=
tance,
 {
   /* If we are converting a qualified type, first convert the
      unqualified type and then apply the qualifiers.  */
-  if (TYPE_CONST (type) || TYPE_VOLATILE (type) || TYPE_RESTRICT (type))
+  if (type->is_const () || TYPE_VOLATILE (type) || TYPE_RESTRICT (type))
     return compile_cplus_convert_qualified (instance, type);
=20
   switch (type->code ())
diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index 5f8c54a34df..b40d3de6763 100644
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -757,7 +757,7 @@ add_array_cv_type (struct ctf_context *ccp,
     }
=20
   el_type =3D inner_array->target_type ();
-  cnst |=3D TYPE_CONST (el_type);
+  cnst |=3D el_type->is_const ();
   voltl |=3D TYPE_VOLATILE (el_type);
   inner_array->set_target_type (make_cv_type (cnst, voltl, el_type));
=20
@@ -857,7 +857,7 @@ read_volatile_type (struct ctf_context *ccp, ctf_id_t t=
id, ctf_id_t btid)
=20
   if (ctf_type_kind (dict, btid) =3D=3D CTF_K_ARRAY)
     return add_array_cv_type (ccp, tid, base_type, 0, 1);
-  cv_type =3D make_cv_type (TYPE_CONST (base_type), 1, base_type);
+  cv_type =3D make_cv_type (base_type->is_const (), 1, base_type);
=20
   return set_tid_type (ccp, tid, cv_type);
 }
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index ce4d6ca8675..067561b6e48 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -5178,7 +5178,7 @@ dwarf2_compute_name (const char *name,
 		  if (type->num_fields () > 0
 		      && type->field (0).is_artificial ()
 		      && type->field (0).type ()->code () =3D=3D TYPE_CODE_PTR
-		      && TYPE_CONST (type->field (0).type ()->target_type ()))
+		      && type->field (0).type ()->target_type ()->is_const ())
 		    buf.puts (" const");
 		}
 	    }
@@ -12176,7 +12176,7 @@ add_array_cv_type (struct die_info *die, struct dwa=
rf2_cu *cu,
     }
=20
   el_type =3D inner_array->target_type ();
-  cnst |=3D TYPE_CONST (el_type);
+  cnst |=3D el_type->is_const ();
   voltl |=3D TYPE_VOLATILE (el_type);
   inner_array->set_target_type (make_cv_type (cnst, voltl, el_type));
=20
@@ -12222,7 +12222,7 @@ read_tag_volatile_type (struct die_info *die, struc=
t dwarf2_cu *cu)
   if (base_type->code () =3D=3D TYPE_CODE_ARRAY)
     return add_array_cv_type (die, cu, base_type, 0, 1);
=20
-  cv_type =3D make_cv_type (TYPE_CONST (base_type), 1, base_type);
+  cv_type =3D make_cv_type (base_type->is_const (), 1, base_type);
   return set_die_type (die, cv_type, cu);
 }
=20
@@ -12521,7 +12521,7 @@ read_subroutine_type (struct die_info *die, struct =
dwarf2_cu *cu)
 		 expects.  GCC marks THIS as const in method definitions,
 		 but not in the class specifications (GCC PR 43053).  */
 	      if (cu->lang () =3D=3D language_cplus
-		  && !TYPE_CONST (arg_type)
+		  && !arg_type->is_const ()
 		  && ftype->field (iparams).is_artificial ())
 		{
 		  int is_this =3D 0;
diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index dd73d9e624f..74b043de9f9 100644
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -4314,7 +4314,7 @@ rank_one_type_parm_ptr (struct type *parm, struct typ=
e *arg, struct value *value
 	if (types_equal (t1, t2))
 	  {
 	    /* Make sure they are CV equal.  */
-	    if (TYPE_CONST (t1) !=3D TYPE_CONST (t2))
+	    if (t1->is_const () !=3D t2->is_const ())
 	      rank.subrank |=3D CV_CONVERSION_CONST;
 	    if (TYPE_VOLATILE (t1) !=3D TYPE_VOLATILE (t2))
 	      rank.subrank |=3D CV_CONVERSION_VOLATILE;
@@ -4700,7 +4700,7 @@ rank_one_type (struct type *parm, struct type *arg, s=
truct value *value)
 	     lvalue references.  */
 	  if (parm->code () =3D=3D TYPE_CODE_RVALUE_REF)
 	    rank.subrank =3D REFERENCE_CONVERSION_RVALUE;
-	  else if (TYPE_CONST (parm->target_type ()))
+	  else if (parm->target_type ()->is_const ())
 	    rank.subrank =3D REFERENCE_CONVERSION_CONST_LVALUE;
 	  else
 	    return INCOMPATIBLE_TYPE_BADNESS;
@@ -4727,7 +4727,7 @@ rank_one_type (struct type *parm, struct type *arg, s=
truct value *value)
 	}
=20
       /* Make sure they are CV equal, too.  */
-      if (TYPE_CONST (t1) !=3D TYPE_CONST (t2))
+      if (t1->is_const () !=3D t2->is_const ())
 	rank.subrank |=3D CV_CONVERSION_CONST;
       if (TYPE_VOLATILE (t1) !=3D TYPE_VOLATILE (t2))
 	rank.subrank |=3D CV_CONVERSION_VOLATILE;
@@ -5021,10 +5021,8 @@ recursive_dump_type (struct type *type, int spaces)
   gdb_printf ("%*stype_chain %s\n", spaces, "",
 	      host_address_to_string (type->chain));
   gdb_printf ("%*sinstance_flags [", spaces, "");
-  if (TYPE_CONST (type))
-    {
-      gdb_puts (" TYPE_CONST");
-    }
+  if (type->is_const ())
+    gdb_puts (" TYPE_CONST");
   if (TYPE_VOLATILE (type))
     {
       gdb_puts (" TYPE_VOLATILE");
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 176d3936661..a4fcd4d07b4 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -168,7 +168,6 @@ struct type_instance_flags
   bool is_atomic : 1;
 };
=20
-#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)
 #define TYPE_ATOMIC(t) (((t)->instance_flags ()).is_atomic)
@@ -1206,6 +1205,12 @@ struct type
     return this->m_instance_flags.is_nottext;
   }
=20
+  /* Return if this type is const.  */
+  bool is_const () const
+  {
+    return this->m_instance_flags.is_const;
+  }
+
   /* Get the bounds bounds of this type.  The type must be a range type.  =
*/
   range_bounds *bounds () const
   {
diff --git a/gdb/m2-typeprint.c b/gdb/m2-typeprint.c
index 59616e7f2d6..30b40105405 100644
--- a/gdb/m2-typeprint.c
+++ b/gdb/m2-typeprint.c
@@ -244,7 +244,7 @@ static void
 m2_pointer (struct type *type, struct ui_file *stream, int show,
 	    int level, const struct type_print_options *flags)
 {
-  if (TYPE_CONST (type))
+  if (type->is_const ())
     gdb_printf (stream, "[...] : ");
   else
     gdb_printf (stream, "POINTER TO ");
diff --git a/gdb/m2-valprint.c b/gdb/m2-valprint.c
index eb2be9d33a8..ee0ab9fda6a 100644
--- a/gdb/m2-valprint.c
+++ b/gdb/m2-valprint.c
@@ -356,7 +356,7 @@ m2_language::value_print_inner (struct value *val, stru=
ct ui_file *stream,
       break;
=20
     case TYPE_CODE_PTR:
-      if (TYPE_CONST (type))
+      if (type->is_const ())
 	print_variable_at_address (type, valaddr, stream, recurse, options);
       else if (options->format && options->format !=3D 's')
 	value_print_scalar_formatted (val, options, 0, stream);
diff --git a/gdb/opencl-lang.c b/gdb/opencl-lang.c
index 8576f4224a2..96119785f92 100644
--- a/gdb/opencl-lang.c
+++ b/gdb/opencl-lang.c
@@ -292,7 +292,7 @@ create_value (struct gdbarch *gdbarch, struct value *va=
l, enum noside noside,
       if (dst_type =3D=3D NULL)
 	dst_type =3D init_vector_type (elm_type, n);
=20
-      make_cv_type (TYPE_CONST (type), TYPE_VOLATILE (type), dst_type);
+      make_cv_type (type->is_const (), TYPE_VOLATILE (type), dst_type);
=20
       if (noside =3D=3D EVAL_AVOID_SIDE_EFFECTS)
 	ret =3D value::allocate (dst_type);
diff --git a/gdb/python/py-type.c b/gdb/python/py-type.c
index 7831e838481..5b98ec1fa7f 100644
--- a/gdb/python/py-type.c
+++ b/gdb/python/py-type.c
@@ -733,7 +733,7 @@ typy_volatile (PyObject *self, PyObject *args)
=20
   try
     {
-      type =3D make_cv_type (TYPE_CONST (type), 1, type);
+      type =3D make_cv_type (type->is_const (), 1, type);
     }
   catch (const gdb_exception &except)
     {
@@ -894,7 +894,7 @@ typy_lookup_type (struct demangle_component *demangled,
 	      rtype =3D make_cv_type (1, TYPE_VOLATILE (type), type);
 	      break;
 	    case DEMANGLE_COMPONENT_VOLATILE:
-	      rtype =3D make_cv_type (TYPE_CONST (type), 1, type);
+	      rtype =3D make_cv_type (type->is_const (), 1, type);
 	      break;
 	    }
 	}
diff --git a/gdb/type-stack.c b/gdb/type-stack.c
index 476848fcad1..05c5ee6e47f 100644
--- a/gdb/type-stack.c
+++ b/gdb/type-stack.c
@@ -159,7 +159,7 @@ type_stack::follow_types (struct type *follow_type)
 				      TYPE_VOLATILE (follow_type),
 				      follow_type);
 	if (make_volatile)
-	  follow_type =3D make_cv_type (TYPE_CONST (follow_type),
+	  follow_type =3D make_cv_type (follow_type->is_const (),
 				      make_volatile,
 				      follow_type);
 	if (make_harvard_aspace !=3D HARVARD_ASPACE_NONE)
diff --git a/gdb/valops.c b/gdb/valops.c
index 76be9c58e6a..ccb2ae21adc 100644
--- a/gdb/valops.c
+++ b/gdb/valops.c
@@ -3650,7 +3650,7 @@ value_struct_elt_for_reference (struct type *domain, =
int offset,
 	    {
 	      for (j =3D 0; j < len; ++j)
 		{
-		  if (TYPE_CONST (intype) !=3D TYPE_FN_FIELD_CONST (f, j))
+		  if (intype->is_const () !=3D TYPE_FN_FIELD_CONST (f, j))
 		    continue;
 		  if (TYPE_VOLATILE (intype) !=3D TYPE_FN_FIELD_VOLATILE (f, j))
 		    continue;
@@ -3873,7 +3873,7 @@ value_rtti_indirect_type (struct value *v, int *full,
     {
       /* Copy qualifiers to the referenced object.  */
       target_type =3D target->type ();
-      real_type =3D make_cv_type (TYPE_CONST (target_type),
+      real_type =3D make_cv_type (target_type->is_const (),
 				TYPE_VOLATILE (target_type), real_type);
       if (TYPE_IS_REFERENCE (type))
 	real_type =3D lookup_reference_type (real_type, type->code ());
@@ -3883,7 +3883,7 @@ value_rtti_indirect_type (struct value *v, int *full,
 	internal_error (_("Unexpected value type."));
=20
       /* Copy qualifiers to the pointer/reference.  */
-      real_type =3D make_cv_type (TYPE_CONST (type), TYPE_VOLATILE (type),
+      real_type =3D make_cv_type (type->is_const (), TYPE_VOLATILE (type),
 				real_type);
     }