[11/12] gdb: remove TYPE_ARRAY_BIT_STRIDE

Message ID 20200706133950.145851-12-simon.marchi@polymtl.ca
State New
Headers show
Series
  • More type macros removal
Related show

Commit Message

Simon Marchi via Gdb-patches July 6, 2020, 1:39 p.m.
From: Simon Marchi <simon.marchi@efficios.com>


Remove it and update all callers to use the equivalent accessor methods.
A subsequent patch will make type::bit_stride work for array types
(effectively replacing this macro), but I wanted to keep this patch a
simple mechanical change.

gdb/ChangeLog:

	* gdbtypes.c (TYPE_ARRAY_BIT_STRIDE): Remove.  Update all
	callers to use the equivalent accessor methods.

Change-Id: I09e14bd45075f98567adce8a0b93edea7722f812
---
 gdb/f-valprint.c | 3 ++-
 gdb/gdbtypes.h   | 7 -------
 gdb/valarith.c   | 2 +-
 3 files changed, 3 insertions(+), 9 deletions(-)

-- 
2.27.0

Patch

diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index bda480376510..17e15f9bdff6 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -124,7 +124,8 @@  f77_print_array_1 (int nss, int ndimensions, struct type *type,
       struct gdbarch *gdbarch = get_type_arch (type);
       size_t dim_size = type_length_units (TYPE_TARGET_TYPE (type));
       int unit_size = gdbarch_addressable_memory_unit_size (gdbarch);
-      size_t byte_stride = TYPE_ARRAY_BIT_STRIDE (type) / (unit_size * 8);
+      size_t byte_stride
+	= type->index_type ()->bounds ()->bit_stride () / (unit_size * 8);
       if (byte_stride == 0)
 	byte_stride = dim_size;
       size_t offs = 0;
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index bf6b270515ff..d8ddc4161391 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1633,13 +1633,6 @@  extern bool set_type_align (struct type *, ULONGEST);
 #define TYPE_DYN_PROP_KIND(dynprop) \
   (dynprop->kind ())
 
-
-/* Accessors for struct range_bounds data attached to an array type's
-   index type.  */
-
-#define TYPE_ARRAY_BIT_STRIDE(arraytype) \
-  ((arraytype)->index_type ()->bounds ()->bit_stride ())
-
 /* C++ */
 
 #define TYPE_SELF_TYPE(thistype) internal_type_self_type (thistype)
diff --git a/gdb/valarith.c b/gdb/valarith.c
index 0b1f43f2e009..775c603a8c32 100644
--- a/gdb/valarith.c
+++ b/gdb/valarith.c
@@ -191,7 +191,7 @@  value_subscripted_rvalue (struct value *array, LONGEST index, LONGEST lowerbound
 
   /* Fetch the bit stride and convert it to a byte stride, assuming 8 bits
      in a byte.  */
-  LONGEST stride = TYPE_ARRAY_BIT_STRIDE (array_type);
+  LONGEST stride = array_type->index_type ()->bounds ()->bit_stride ();
   if (stride != 0)
     {
       struct gdbarch *arch = get_type_arch (elt_type);