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
This commit is contained in:
Simon Marchi 2020-07-12 22:58:53 -04:00 committed by Simon Marchi
parent 39498edbc8
commit bb789949e9
5 changed files with 12 additions and 12 deletions

View file

@ -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,

View file

@ -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)
{

View file

@ -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. */

View file

@ -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 ())))

View file

@ -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;