gdb: introduce field::is_artificial / field::set_is_artificial

Add these two methods, rename the field to m_artificial to make it
pseudo private.

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

diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index 3c1e9179411b17bea571fd4c2328a4442009a618..03d6e03b6304b6b8410e88c8e9239f494de551ed 100644 (file)
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -277,7 +277,7 @@ buildsym_compunit::finish_block_internal
                  if (sym->is_argument ())
                    {
                      ftype->field (iparams).set_type (sym->type ());
-                     TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
+                     ftype->field (iparams).set_is_artificial (false);
                      iparams++;
                    }
                }

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 94d98feb56b6197c7e3871b1062817c0ea6667fd..63b099c111b5a4127edf0dfd909ecf3b1df68769 100644 (file)
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -6060,7 +6060,7 @@ quirk_rust_enum (struct type *type, struct objfile *objfile)
 
       /* Put the discriminant at index 0.  */
       type->field (0).set_type (field_type);
-      TYPE_FIELD_ARTIFICIAL (type, 0) = 1;
+      type->field (0).set_is_artificial (true);
       type->field (0).set_name ("<<discriminant>>");
       type->field (0).set_loc_bitpos (bit_offset);
 
@@ -6158,7 +6158,7 @@ quirk_rust_enum (struct type *type, struct objfile *objfile)
 
       /* Install the discriminant at index 0 in the union.  */
       type->field (0) = *disr_field;
-      TYPE_FIELD_ARTIFICIAL (type, 0) = 1;
+      type->field (0).set_is_artificial (true);
       type->field (0).set_name ("<<discriminant>>");
 
       /* We need a way to find the correct discriminant given a
@@ -11743,7 +11743,7 @@ dwarf2_add_field (struct field_info *fip, struct die_info *die,
         pointer or virtual base class pointer) to private.  */
       if (dwarf2_attr (die, DW_AT_artificial, cu))
        {
-         FIELD_ARTIFICIAL (*fp) = 1;
+         fp->set_is_artificial (true);
          new_field->accessibility = DW_ACCESS_private;
          fip->non_public_fields = true;
        }
@@ -13588,10 +13588,10 @@ quirk_ada_thick_pointer (struct die_info *die, struct dwarf2_cu *cu,
          struct field &upper = range_fields[range_fields.size () - 1];
 
          lower.set_type (underlying);
-         FIELD_ARTIFICIAL (lower) = 1;
+         lower.set_is_artificial (true);
 
          upper.set_type (underlying);
-         FIELD_ARTIFICIAL (upper) = 1;
+         upper.set_is_artificial (true);
 
          if (!recognize_bound_expression (child_die, DW_AT_lower_bound,
                                           &bounds_offset, &lower, cu)
@@ -14713,9 +14713,9 @@ read_subroutine_type (struct die_info *die, struct dwarf2_cu *cu)
                 4.5 does not yet generate.  */
              attr = dwarf2_attr (child_die, DW_AT_artificial, cu);
              if (attr != nullptr)
-               TYPE_FIELD_ARTIFICIAL (ftype, iparams) = attr->as_boolean ();
+               ftype->field (iparams).set_is_artificial (attr->as_boolean ());
              else
-               TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
+               ftype->field (iparams).set_is_artificial (false);
              arg_type = die_type (child_die, cu);
 
              /* RealView does not mark THIS as const, which the testsuite

diff --git a/gdb/gdb-gdb.py.in b/gdb/gdb-gdb.py.in
index 56d063cd506b987b54949b47968b123748d788d6..af4453f6eb22d2354ddb691c7fd33a8189efb741 100644 (file)
--- a/gdb/gdb-gdb.py.in
+++ b/gdb/gdb-gdb.py.in
@@ -172,7 +172,7 @@ class StructMainTypePrettyPrinter:
         """Return an image of the main_type field number FIELDNO."""
         f = self.val["flds_bnds"]["fields"][fieldno]
         label = "flds_bnds.fields[%d]:" % fieldno
-        if f["artificial"]:
+        if f["m_artificial"]:
             label += " (artificial)"
         fields = []
         fields.append("m_name = %s" % f["m_name"])

diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c
index 6abe5eaad0a1d2e6364855675240c5d42848f7f3..ca168b31529feca4072a1265b49796fdd5e6dc6c 100644 (file)
--- a/gdb/gdbtypes.c
+++ b/gdb/gdbtypes.c
@@ -5541,8 +5541,8 @@ copy_type_recursive (struct type *type, htab_t copied_types)
 
       for (i = 0; i < nfields; i++)
        {
-         TYPE_FIELD_ARTIFICIAL (new_type, i) = 
-           TYPE_FIELD_ARTIFICIAL (type, i);
+         new_type->field (i).set_is_artificial
+           (TYPE_FIELD_ARTIFICIAL (type, i));
          TYPE_FIELD_BITSIZE (new_type, i) = TYPE_FIELD_BITSIZE (type, i);
          if (type->field (i).type ())
            new_type->field (i).set_type

diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 8f592dbe1c01bd82007449101dc31f940daecb8b..43263a90714d05689dbd1a8f7d9a194447323191 100644 (file)
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -564,6 +564,16 @@ struct field
     m_name = name;
   }
 
+  bool is_artificial () const
+  {
+    return m_artificial;
+  }
+
+  void set_is_artificial (bool is_artificial)
+  {
+    m_artificial = is_artificial;
+  }
+
   /* Return true if this field is static; false if not.  */
   bool is_static () const
   {
@@ -650,7 +660,7 @@ struct field
      to the user.  For TYPE_CODE_RANGE it is set if the specific
      bound is not defined.  */
 
-  unsigned int artificial : 1;
+  unsigned int m_artificial : 1;
 
   /* * Discriminant for union field_location.  */
 
@@ -1913,7 +1923,7 @@ extern void set_type_vptr_basetype (struct type *, struct type *);
   (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \
     : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (index)))
 
-#define FIELD_ARTIFICIAL(thisfld) ((thisfld).artificial)
+#define FIELD_ARTIFICIAL(thisfld) ((thisfld).is_artificial ())
 #define FIELD_BITSIZE(thisfld) ((thisfld).bitsize)
 
 #define TYPE_FIELD_ARTIFICIAL(thistype, n) FIELD_ARTIFICIAL((thistype)->field (n))

diff --git a/gdb/mdebugread.c b/gdb/mdebugread.c
index ad9967b75fad6da0e2ddefbb1d5d06d2736e7b36..109bd64e5183f6923399e4255a55da9b27d3a62e 100644 (file)
--- a/gdb/mdebugread.c
+++ b/gdb/mdebugread.c
@@ -1206,7 +1206,7 @@ parse_symbol (SYMR *sh, union aux_ext *ax, char *ext_sh, int bigend,
                      if (sym->is_argument ())
                        {
                          ftype->field (iparams).set_type (sym->type ());
-                         TYPE_FIELD_ARTIFICIAL (ftype, iparams) = 0;
+                         ftype->field (iparams).set_is_artificial (false);
                          iparams++;
                        }
                    }

diff --git a/gdb/stabsread.c b/gdb/stabsread.c
index 1269fc02d72407f238970be086091f970ec265f5..4a4b39b41e092bd2eba9c6ba9e679580629f9a9a 100644 (file)
--- a/gdb/stabsread.c
+++ b/gdb/stabsread.c
@@ -1002,7 +1002,8 @@ define_symbol (CORE_ADDR valu, const char *string, int desc, int type,
              if (ptype->code () == TYPE_CODE_VOID)
                ptype = builtin_type (objfile)->builtin_int;
              ftype->field (nparams).set_type (ptype);
-             TYPE_FIELD_ARTIFICIAL (ftype, nparams++) = 0;
+             ftype->field (nparams).set_is_artificial (false);
+             nparams++;
            }
          ftype->set_num_fields (nparams);
          ftype->set_is_prototyped (true);