FreeChainXenon/binutils-gdb
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

* ada-lang.c (ada_array_bound_from_type): Make non-static.

Browse source 
Handle properly the case when the index type is an enumerated type.
        Do not return the subtype of the bounds type, just return the
        bounds type directly - this is not needed and is more consistent
        with what we do for arrays when no XA parallel type exists.
This commit is contained in:
Joel Brobecker 2008-01-03 14:07:10 +00:00
parent a4d0b9c3e1
commit abb68b3e0c
2 changed files with 24 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

8
gdb/ChangeLog
View file

@ -1,3 +1,11 @@
2008-01-03 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (ada_array_bound_from_type): Make non-static.
Handle properly the case when the index type is an enumerated type.
Do not return the subtype of the bounds type, just return the
bounds type directly - this is not needed and is more consistent
with what we do for arrays when no XA parallel type exists.
2008-01-03 Joel Brobecker <brobecker@adacore.com> 2008-01-03 Joel Brobecker <brobecker@adacore.com>
* ada-lang.c (static_unwrap_type): Add forward declaration. * ada-lang.c (static_unwrap_type): Add forward declaration.

27
gdb/ada-lang.c
View file

@ -2480,7 +2480,7 @@ ada_index_type (struct type *type, int n)
bounds type. It works for other arrays with bounds supplied by bounds type. It works for other arrays with bounds supplied by
run-time quantities other than discriminants. */ run-time quantities other than discriminants. */
LONGEST static LONGEST
ada_array_bound_from_type (struct type * arr_type, int n, int which, ada_array_bound_from_type (struct type * arr_type, int n, int which,
struct type ** typep) struct type ** typep)
{ {
@ -2505,7 +2505,6 @@ ada_array_bound_from_type (struct type * arr_type, int n, int which,
index_type_desc = ada_find_parallel_type (type, "___XA"); index_type_desc = ada_find_parallel_type (type, "___XA");
if (index_type_desc == NULL) if (index_type_desc == NULL)
{ {
struct type *range_type;
struct type *index_type; struct type *index_type;
while (n > 1) while (n > 1)
@ -2514,24 +2513,30 @@ ada_array_bound_from_type (struct type * arr_type, int n, int which,
n -= 1; n -= 1;
} }
range_type = TYPE_INDEX_TYPE (type); index_type = TYPE_INDEX_TYPE (type);
index_type = TYPE_TARGET_TYPE (range_type);
if (TYPE_CODE (index_type) == TYPE_CODE_UNDEF)
index_type = builtin_type_long;
if (typep != NULL) if (typep != NULL)
*typep = index_type; *typep = index_type;
/* The index type is either a range type or an enumerated type.
For the range type, we have some macros that allow us to
extract the value of the low and high bounds. But they
do now work for enumerated types. The expressions used
below work for both range and enum types. */
return return
(LONGEST) (which == 0 (LONGEST) (which == 0
? TYPE_LOW_BOUND (range_type) ? TYPE_FIELD_BITPOS (index_type, 0)
: TYPE_HIGH_BOUND (range_type)); : TYPE_FIELD_BITPOS (index_type,
TYPE_NFIELDS (index_type) - 1));
} }
else else
{ {
struct type *index_type = struct type *index_type =
to_fixed_range_type (TYPE_FIELD_NAME (index_type_desc, n - 1), to_fixed_range_type (TYPE_FIELD_NAME (index_type_desc, n - 1),
NULL, TYPE_OBJFILE (arr_type)); NULL, TYPE_OBJFILE (arr_type));
if (typep != NULL) if (typep != NULL)
*typep = TYPE_TARGET_TYPE (index_type); *typep = index_type;
return return
(LONGEST) (which == 0 (LONGEST) (which == 0
? TYPE_LOW_BOUND (index_type) ? TYPE_LOW_BOUND (index_type)
@ -2540,8 +2545,8 @@ ada_array_bound_from_type (struct type * arr_type, int n, int which,
} }
/* Given that arr is an array value, returns the lower bound of the /* Given that arr is an array value, returns the lower bound of the
nth index (numbering from 1) if which is 0, and the upper bound if nth index (numbering from 1) if WHICH is 0, and the upper bound if
which is 1. This routine will also work for arrays with bounds WHICH is 1. This routine will also work for arrays with bounds
supplied by run-time quantities other than discriminants. */ supplied by run-time quantities other than discriminants. */
struct value * struct value *