gdb: remove TYPE_ARRAY_{LOWER,UPPER}_BOUND_VALUE

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

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index e17a61ee063648dc6c12c03f65b3c6e3e4272b68..ab2b777807520ad1be3fab81483830362bfbedb3 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2020-07-12  Simon Marchi  <simon.marchi@efficios.com>
+
+       * gdbtypes.h (TYPE_ARRAY_LOWER_BOUND_VALUE,
+       TYPE_ARRAY_UPPER_BOUND_VALUE): Remove.  Update all
+       callers to use the equivalent accessor methods instead.
+
 2020-07-12  Simon Marchi  <simon.marchi@efficios.com>
 
        * gdbtypes.h (TYPE_ARRAY_UPPER_BOUND_IS_UNDEFINED,

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index 8d0b6c21faff619169573714330fa99002397b91..3d85a5a014d4692973b0f7b09d8d10651109e0c8 100644 (file)
--- 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 05f98bc3505279c2e3abc2f534935b6f03f7b28e..bda48037651025cd66bae8e1616e78c55c1a912b 100644 (file)
--- 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 83432b6fc7785eb98fdda78d32a2f2d22f39b891..26db7935f2651d89d016dc79039a07adb9c3ec1f 100644 (file)
--- 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 5a32667603b7e2431aa5962457fcf664a8d2d153..d52358aa4bb4526c18135eca1cceeea92ddd2dc5 100644 (file)
--- 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;