[Ada] fix warning when printing empty array

This patch should fix the following regression:

     (gdb) print my_table
    -$1 = ()
    -(gdb) PASS: gdb.ada/null_array.exp: print my_table
    +$1 = (warning: unable to get bounds of array, assuming null array
    +)
    +(gdb) FAIL: gdb.ada/null_array.exp: print my_table

The problem was introduced by a change in val_print_array_elements
which removed a check for the case where the array's high bound
is smaller than the array's low bound (empty array).

This change restores the check and forces the len to zero in that case.
Looking at the patch that caused the regression, I suspect that we may
have other parts that might have been broken (non-zero array low bound?).

gdb/ChangeLog:

        * valprint.c (val_print_array_elements): Put back handling of
        empty arrays.
This commit is contained in:
Joel Brobecker 2010-11-03 23:20:13 +00:00
parent ee7f4c692b
commit 75be741bdf
2 changed files with 16 additions and 1 deletions

View File

@ -1,3 +1,8 @@
2010-11-03 Joel Brobecker <brobecker@adacore.com>
* valprint.c (val_print_array_elements): Put back handling of
empty arrays.
2010-11-03 Ken Werner <ken.werner@de.ibm.com>
* dwarf2read.c (read_array_type): Read the DW_AT_byte_size from the

View File

@ -1118,7 +1118,17 @@ val_print_array_elements (struct type *type, const gdb_byte *valaddr,
index_type = TYPE_INDEX_TYPE (type);
if (get_array_bounds (type, &low_bound, &high_bound))
{
/* The array length should normally be HIGH_BOUND - LOW_BOUND + 1.
But we have to be a little extra careful, because some languages
such as Ada allow LOW_BOUND to be greater than HIGH_BOUND for
empty arrays. In that situation, the array length is just zero,
not negative! */
if (low_bound > high_bound)
len = 0;
else
len = high_bound - low_bound + 1;
}
else
{
warning (_("unable to get bounds of array, assuming null array"));