summaryrefslogtreecommitdiff
path: root/gdb/valprint.c
diff options
context:
space:
mode:
authorJoel Brobecker <brobecker@gnat.com>2010-11-03 23:20:13 +0000
committerJoel Brobecker <brobecker@gnat.com>2010-11-03 23:20:13 +0000
commit75be741bdf0c664773f0cb0668a401887ee7706d (patch)
tree58a66d5ee9d6037bd5bc743e16ec91681c045e85 /gdb/valprint.c
parentee7f4c692b90f6db605fb5f322f522bcb2927218 (diff)
downloadbinutils-gdb-75be741bdf0c664773f0cb0668a401887ee7706d.tar.gz
[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.
Diffstat (limited to 'gdb/valprint.c')
-rw-r--r--gdb/valprint.c12
1 files changed, 11 insertions, 1 deletions
diff --git a/gdb/valprint.c b/gdb/valprint.c
index dba528bdf66..ddb16e4847c 100644
--- a/gdb/valprint.c
+++ b/gdb/valprint.c
@@ -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))
- len = high_bound - low_bound + 1;
+ {
+ /* 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"));