gdb: Check for not allocated/associated values during array slicing

When extracting an array slice we should give up if the array is
not-allocated or not-associated.  For Fortran, at least in gfortran
compiled code, the upper and lower bounds are undefined if the array
is not allocated or not associated, in which case performing checks
against these bounds will result in undefined behaviour.

Better then to throw an error if we try to slice such an array.  This
changes the error message that the user will receive in these
cases (if they got an error message before).  Previously they may have
gotten "slice out of range" now they'll get "array not allocated" or
"array not associated".

gdb/ChangeLog:

	* valops.c (value_slice): Check for not allocated or not
	associated values.

gdb/testsuite/ChangeLog:

	* gdb.fortran/vla-sizeof.exp: Update expected results.
This commit is contained in:
Andrew Burgess 2019-05-23 19:49:41 +01:00
parent 9ab084121f
commit a706786341
4 changed files with 16 additions and 2 deletions

View File

@ -1,3 +1,8 @@
2019-06-10 Andrew Burgess <andrew.burgess@embecosm.com>
* valops.c (value_slice): Check for not allocated or not
associated values.
2019-06-10 Tom de Vries <tdevries@suse.de>
PR gdb/24618

View File

@ -1,3 +1,7 @@
2019-06-10 Andrew Burgess <andrew.burgess@embecosm.com>
* gdb.fortran/vla-sizeof.exp: Update expected results.
2019-06-06 Amos Bird <amosbird@gmail.com>
* gdb.base/annota1.exp (thread_switch): Add test for

View File

@ -32,7 +32,7 @@ gdb_test "print sizeof(vla1)" " = 0" "print sizeof non-allocated vla1"
gdb_test "print sizeof(vla1(3,2,1))" \
"no such vector element \\(vector not allocated\\)" \
"print sizeof non-allocated indexed vla1"
gdb_test "print sizeof(vla1(3:4,2,1))" "slice out of range" \
gdb_test "print sizeof(vla1(3:4,2,1))" "array not allocated" \
"print sizeof non-allocated sliced vla1"
# Try to access value in allocated VLA
@ -49,7 +49,7 @@ gdb_test "print sizeof(pvla)" " = 0" "print sizeof non-associated pvla"
gdb_test "print sizeof(pvla(3,2,1))" \
"no such vector element \\(vector not associated\\)" \
"print sizeof non-associated indexed pvla"
gdb_test "print sizeof(pvla(3:4,2,1))" "slice out of range" \
gdb_test "print sizeof(pvla(3:4,2,1))" "array not associated" \
"print sizeof non-associated sliced pvla"
# Try to access values in pointer to VLA and compare them

View File

@ -3801,6 +3801,11 @@ value_slice (struct value *array, int lowbound, int length)
&& TYPE_CODE (array_type) != TYPE_CODE_STRING)
error (_("cannot take slice of non-array"));
if (type_not_allocated (array_type))
error (_("array not allocated"));
if (type_not_associated (array_type))
error (_("array not associated"));
range_type = TYPE_INDEX_TYPE (array_type);
if (get_discrete_bounds (range_type, &lowerbound, &upperbound) < 0)
error (_("slice from bad array or bitstring"));