[PATCH 15/22] gdb: add type::stub_is_supported / type::set_stub_is_supported

Simon Marchi simon.marchi@efficios.com
Tue Aug 18 16:58:34 GMT 2020


Add the `stub_is_supported` and `set_stub_is_supported` methods on `struct type`, in
order to remove the `TYPE_STUB_SUPPORTED` macro.  In this patch, the macro is
changed to use the getter, so all the call sites of the macro that are
used as a setter are changed to use the setter method directly.  The
next patch will remove the macro completely.

gdb/ChangeLog:

	* gdbtypes.h (struct type) <stub_is_supported, set_stub_is_supported>: New methods.
	(TYPE_STUB_SUPPORTED): Use type::stub_is_supported, change all write call sites to
	use type::set_stub_is_supported.

Change-Id: I4dfecf2b5df9c2b7bb8db1e9252082140adf3028
---
 gdb/dwarf2/read.c |  2 +-
 gdb/gdbtypes.h    | 14 ++++++++++++--
 2 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 43c6d5300bf..b087dc7ece8 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -16084,7 +16084,7 @@ read_structure_type (struct die_info *die, struct dwarf2_cu *cu)
       type->set_is_stub (true);
     }
   else
-    TYPE_STUB_SUPPORTED (type) = 1;
+    type->set_stub_is_supported (true);
 
   if (die_is_declaration (die, cu))
     type->set_is_stub (true);
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 0e9b503b4f0..7e7d1553950 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -233,7 +233,7 @@ DEF_ENUM_FLAGS_TYPE (enum type_instance_flag_value, type_instance_flags);
    TYPE_STUB(t) with !TYPE_STUB_SUPPORTED(t) may exist if we only
    guessed the TYPE_STUB(t) value (see dwarfread.c).  */
 
-#define TYPE_STUB_SUPPORTED(t)   (TYPE_MAIN_TYPE (t)->flag_stub_supported)
+#define TYPE_STUB_SUPPORTED(t)   ((t)->stub_is_supported ())
 
 /* * Not textual.  By default, GDB treats all single byte integers as
    characters (or elements of strings) unless this flag is set.  */
@@ -820,7 +820,7 @@ struct main_type
   unsigned int m_flag_prototyped : 1;
   unsigned int m_flag_varargs : 1;
   unsigned int m_flag_vector : 1;
-  unsigned int flag_stub_supported : 1;
+  unsigned int m_flag_stub_supported : 1;
   unsigned int flag_gnu_ifunc : 1;
   unsigned int flag_fixed_instance : 1;
   unsigned int flag_objfile_owned : 1;
@@ -1125,6 +1125,16 @@ struct type
     this->main_type->m_flag_vector = is_vector;
   }
 
+  bool stub_is_supported () const
+  {
+    return this->main_type->m_flag_stub_supported;
+  }
+
+  void set_stub_is_supported (bool stub_is_supported)
+  {
+    this->main_type->m_flag_stub_supported = stub_is_supported;
+  }
+
   /* * Return the dynamic property of the requested KIND from this type's
      list of dynamic properties.  */
   dynamic_prop *dyn_prop (dynamic_prop_node_kind kind) const;
-- 
2.28.0



More information about the Gdb-patches mailing list