[09/12] gdb: remove TYPE_ARRAY_{LOWER,UPPER}_BOUND_VALUE

Message ID 20200706133833.145408-10-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:38 p.m.
From: Simon Marchi <simon.marchi@efficios.com>


Remove the macros, use the various equivalent getters instead.

gdb/ChangeLog:

	* gdbtypes.h (TYPE_ARRAY_LOWER_BOUND_VALUE,
	TYPE_ARRAY_UPPER_BOUND_VALUE): Remove.  Update all
	callers to use the equivalent accessor methods instead.

Change-Id: I7f96d988f872170e7a2f58095832710e62b85cfd
---
 gdb/ada-lang.c    | 4 ++--
 gdb/f-valprint.c  | 4 ++--
 gdb/gdbtypes.h    | 6 ------
 gdb/p-typeprint.c | 4 ++--
 4 files changed, 6 insertions(+), 12 deletions(-)

-- 
2.27.0

Patch

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 823d339912a9..2fc5fc1fdc2c 100644
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -9492,8 +9492,8 @@  assign_aggregate (struct value *container,
     {
       lhs = ada_coerce_to_simple_array (lhs);
       lhs_type = check_typedef (value_type (lhs));
-      low_index = TYPE_ARRAY_LOWER_BOUND_VALUE (lhs_type);
-      high_index = TYPE_ARRAY_UPPER_BOUND_VALUE (lhs_type);
+      low_index = lhs_type->index_type ()->bounds ()->low.const_val ();
+      high_index = lhs_type->index_type ()->bounds ()->high.const_val ();
     }
   else if (lhs_type->code () == TYPE_CODE_STRUCT)
     {
diff --git a/gdb/f-valprint.c b/gdb/f-valprint.c
index 05f98bc35052..bda480376510 100644
--- a/gdb/f-valprint.c
+++ b/gdb/f-valprint.c
@@ -49,7 +49,7 @@  f77_get_lowerbound (struct type *type)
   if (type->index_type ()->bounds ()->low.kind () == PROP_UNDEFINED)
     error (_("Lower bound may not be '*' in F77"));
 
-  return TYPE_ARRAY_LOWER_BOUND_VALUE (type);
+  return type->index_type ()->bounds ()->low.const_val ();
 }
 
 LONGEST
@@ -65,7 +65,7 @@  f77_get_upperbound (struct type *type)
       return f77_get_lowerbound (type);
     }
 
-  return TYPE_ARRAY_UPPER_BOUND_VALUE (type);
+  return type->index_type ()->bounds ()->high.const_val ();
 }
 
 /* Obtain F77 adjustable array dimensions.  */
diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h
index 83432b6fc778..26db7935f265 100644
--- a/gdb/gdbtypes.h
+++ b/gdb/gdbtypes.h
@@ -1628,12 +1628,6 @@  extern bool set_type_align (struct type *, ULONGEST);
 /* Accessors for struct range_bounds data attached to an array type's
    index type.  */
 
-#define TYPE_ARRAY_UPPER_BOUND_VALUE(arraytype) \
-   ((arraytype)->index_type ()->bounds ()->high.const_val ())
-
-#define TYPE_ARRAY_LOWER_BOUND_VALUE(arraytype) \
-   ((arraytype)->index_type ()->bounds ()->low.const_val ())
-
 #define TYPE_ARRAY_BIT_STRIDE(arraytype) \
   (TYPE_BIT_STRIDE(((arraytype)->index_type ())))
 
diff --git a/gdb/p-typeprint.c b/gdb/p-typeprint.c
index 5a32667603b7..d52358aa4bb4 100644
--- a/gdb/p-typeprint.c
+++ b/gdb/p-typeprint.c
@@ -276,8 +276,8 @@  pascal_type_print_varspec_prefix (struct type *type, struct ui_file *stream,
       if (TYPE_LENGTH (TYPE_TARGET_TYPE (type)) > 0
 	  && type->index_type ()->bounds ()->high.kind () != PROP_UNDEFINED)
 	fprintf_filtered (stream, "[%s..%s] ",
-			  plongest (TYPE_ARRAY_LOWER_BOUND_VALUE (type)),
-			  plongest (TYPE_ARRAY_UPPER_BOUND_VALUE (type)));
+			  plongest (type->index_type ()->bounds ()->low.const_val ()),
+			  plongest (type->index_type ()->bounds ()->high.const_val ()));
       fprintf_filtered (stream, "of ");
       break;