3f2f83ddcb
Fortran provide types whose values may be dynamically allocated
or associated with a variable under explicit program control.
The purpose of this commit is:
* to read allocated/associated DWARF tags and store them in
the dynamic property list of main_type.
* enable GDB to print the value of a dynamic array in Fortran
in case the type is allocated or associated (pointer to
dynamic array).
Examples:
(gdb) p vla_not_allocated
$1 = <not allocated>
(gdb) p vla_allocated
$1 = (1, 2, 3)
(gdb) p vla_ptr_not_associated
$1 = <not associated>
(gdb) p vla_ptr_associated
$1 = (1, 2, 3)
Add basic test coverage for most dynamic array use-cases in Fortran.
The commit contains the following tests:
* Ensure that values of Fortran dynamic arrays
can be evaluated correctly in various ways and states.
* Ensure that Fortran primitives can be evaluated
correctly when used as a dynamic array.
* Dynamic arrays passed to subroutines and handled
in different ways inside the routine.
* Ensure that the ptype of dynamic arrays in
Fortran can be printed in GDB correctly.
* Ensure that dynamic arrays in different states
(allocated/associated) can be evaluated.
* Dynamic arrays passed to functions and returned from
functions.
* History values of dynamic arrays can be accessed and
printed again with the correct values.
* Dynamic array evaluations using MI protocol.
* Sizeof output of dynamic arrays in various states.
The patch was tested using the test suite on Ubuntu 12.04 64bit.
gdb/ChangeLog:
* dwarf2read.c (set_die_type): Add read of
DW_AT_allocated and DW_AT_associated.
* f-typeprint.c: New include of typeprint.h
(f_print_type): Add check for allocated/associated
status of type.
(f_type_print_varspec_suffix): Add check for
allocated/associated status of type.
* gdbtypes.c (create_array_type_with_stride):
Add check for valid data location of type in
case allocated or associated attributes are set.
Length of an array should be only calculated if
allocated or associated is resolved as true.
(is_dynamic_type_internal): Add check for allocated/
associated.
(resolve_dynamic_array): Evaluate allocated/associated
properties.
* gdbtypes.h (enum dynamic_prop_node_kind): <DYN_PROP_ALLOCATED>
<DYN_PROP_ASSOCIATED>: New enums.
(TYPE_ALLOCATED_PROP, TYPE_ASSOCIATED_PROP): New macros.
(type_not_allocated): New function.
(type_not_associated): New function.
* valarith.c (value_subscripted_rvalue): Add check for
allocated/associated.
* valprint.c: New include of typeprint.h.
(valprint_check_validity): Add check for allocated/associated.
(value_check_printable): Add check for allocated/
associated.
* typeprint.h (val_print_not_allocated): New function.
(val_print_not_associated): New function.
* typeprint.c (val_print_not_allocated): New function.
(val_print_not_associated): New function.
gdb/testsuite/ChangeLog:
* gdb.fortran/vla-alloc-assoc.exp: New file.
* gdb.fortran/vla-datatypes.exp: New file.
* gdb.fortran/vla-datatypes.f90: New file.
* gdb.fortran/vla-history.exp: New file.
* gdb.fortran/vla-ptype-sub.exp: New file.
* gdb.fortran/vla-ptype.exp: New file.
* gdb.fortran/vla-sizeof.exp: New file.
* gdb.fortran/vla-sub.f90: New file.
* gdb.fortran/vla-value-sub-arbitrary.exp: New file.
* gdb.fortran/vla-value-sub-finish.exp: New file.
* gdb.fortran/vla-value-sub.exp: New file.
* gdb.fortran/vla-value.exp: New file.
* gdb.fortran/vla-ptr-info.exp: New file.
* gdb.mi/mi-vla-fortran.exp: New file.
* gdb.mi/vla.f90: New file.
148 lines
6.2 KiB
Text
148 lines
6.2 KiB
Text
# Copyright 2015 Free Software Foundation, Inc.
|
|
|
|
# This program is free software; you can redistribute it and/or modify
|
|
# it under the terms of the GNU General Public License as published by
|
|
# the Free Software Foundation; either version 3 of the License, or
|
|
# (at your option) any later version.
|
|
#
|
|
# This program is distributed in the hope that it will be useful,
|
|
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
# GNU General Public License for more details.
|
|
#
|
|
# You should have received a copy of the GNU General Public License
|
|
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
standard_testfile "vla.f90"
|
|
|
|
if { [prepare_for_testing ${testfile}.exp ${testfile} ${srcfile} \
|
|
{debug f90 quiet}] } {
|
|
return -1
|
|
}
|
|
|
|
if ![runto_main] {
|
|
untested "could not run to main"
|
|
return -1
|
|
}
|
|
|
|
# Try to access values in non allocated VLA
|
|
gdb_breakpoint [gdb_get_line_number "vla1-init"]
|
|
gdb_continue_to_breakpoint "vla1-init"
|
|
gdb_test "print vla1" " = <not allocated>" "print non-allocated vla1"
|
|
gdb_test "print &vla1" \
|
|
" = \\\(PTR TO -> \\\( real\\\(kind=4\\\) \\\(<not allocated>\\\)\\\)\\\) $hex" \
|
|
"print non-allocated &vla1"
|
|
gdb_test "print vla1(1,1,1)" "no such vector element \\\(vector not allocated\\\)" \
|
|
"print member in non-allocated vla1 (1)"
|
|
gdb_test "print vla1(101,202,303)" \
|
|
"no such vector element \\\(vector not allocated\\\)" \
|
|
"print member in non-allocated vla1 (2)"
|
|
gdb_test "print vla1(5,2,18)=1" "no such vector element \\\(vector not allocated\\\)" \
|
|
"set member in non-allocated vla1"
|
|
|
|
# Try to access value in allocated VLA
|
|
gdb_breakpoint [gdb_get_line_number "vla2-allocated"]
|
|
gdb_continue_to_breakpoint "vla2-allocated"
|
|
gdb_test "next" "\\d+(\\t|\\s)+vla1\\\(3, 6, 9\\\) = 42" \
|
|
"step over value assignment of vla1"
|
|
gdb_test "print &vla1" \
|
|
" = \\\(PTR TO -> \\\( real\\\(kind=4\\\) \\\(10,10,10\\\)\\\)\\\) $hex" \
|
|
"print allocated &vla1"
|
|
gdb_test "print vla1(3, 6, 9)" " = 1311" "print allocated vla1(3,6,9)"
|
|
gdb_test "print vla1(1, 3, 8)" " = 1311" "print allocated vla1(1,3,8)"
|
|
gdb_test "print vla1(9, 9, 9) = 999" " = 999" \
|
|
"print allocated vla1(9,9,9)=1"
|
|
|
|
# Try to access values in allocated VLA after specific assignment
|
|
gdb_breakpoint [gdb_get_line_number "vla1-filled"]
|
|
gdb_continue_to_breakpoint "vla1-filled"
|
|
gdb_test "print vla1(3, 6, 9)" " = 42" \
|
|
"print allocated vla1(3,6,9) after specific assignment (filled)"
|
|
gdb_test "print vla1(1, 3, 8)" " = 1001" \
|
|
"print allocated vla1(1,3,8) after specific assignment (filled)"
|
|
gdb_test "print vla1(9, 9, 9)" " = 999" \
|
|
"print allocated vla1(9,9,9) after assignment in debugger (filled)"
|
|
|
|
# Try to access values in undefined pointer to VLA (dangling)
|
|
gdb_test "print pvla" " = <not associated>" "print undefined pvla"
|
|
gdb_test "print &pvla" \
|
|
" = \\\(PTR TO -> \\\( real\\\(kind=4\\\) \\\(<not associated>\\\)\\\)\\\) $hex" \
|
|
"print non-associated &pvla"
|
|
gdb_test "print pvla(1, 3, 8)" "no such vector element \\\(vector not associated\\\)" \
|
|
"print undefined pvla(1,3,8)"
|
|
|
|
# Try to access values in pointer to VLA and compare them
|
|
gdb_breakpoint [gdb_get_line_number "pvla-associated"]
|
|
gdb_continue_to_breakpoint "pvla-associated"
|
|
gdb_test "print &pvla" \
|
|
" = \\\(PTR TO -> \\\( real\\\(kind=4\\\) \\\(10,10,10\\\)\\\)\\\) $hex" \
|
|
"print associated &pvla"
|
|
gdb_test "print pvla(3, 6, 9)" " = 42" "print associated pvla(3,6,9)"
|
|
gdb_test "print pvla(1, 3, 8)" " = 1001" "print associated pvla(1,3,8)"
|
|
gdb_test "print pvla(9, 9, 9)" " = 999" "print associated pvla(9,9,9)"
|
|
|
|
# Fill values to VLA using pointer and check
|
|
gdb_breakpoint [gdb_get_line_number "pvla-re-associated"]
|
|
gdb_continue_to_breakpoint "pvla-re-associated"
|
|
gdb_test "print pvla(5, 45, 20)" \
|
|
" = 1" "print pvla(5, 45, 20) after filled using pointer"
|
|
gdb_test "print vla2(5, 45, 20)" \
|
|
" = 1" "print vla2(5, 45, 20) after filled using pointer"
|
|
gdb_test "print pvla(7, 45, 14)" " = 2" \
|
|
"print pvla(7, 45, 14) after filled using pointer"
|
|
gdb_test "print vla2(7, 45, 14)" " = 2" \
|
|
"print vla2(7, 45, 14) after filled using pointer"
|
|
|
|
# Try to access values of deassociated VLA pointer
|
|
gdb_breakpoint [gdb_get_line_number "pvla-deassociated"]
|
|
gdb_continue_to_breakpoint "pvla-deassociated"
|
|
gdb_test "print pvla(5, 45, 20)" \
|
|
"no such vector element \\\(vector not associated\\\)" \
|
|
"print pvla(5, 45, 20) after deassociated"
|
|
gdb_test "print pvla(7, 45, 14)" \
|
|
"no such vector element \\\(vector not associated\\\)" \
|
|
"print pvla(7, 45, 14) after dissasociated"
|
|
gdb_test "print pvla" " = <not associated>" \
|
|
"print vla1 after deassociated"
|
|
|
|
# Try to access values of deallocated VLA
|
|
gdb_breakpoint [gdb_get_line_number "vla1-deallocated"]
|
|
gdb_continue_to_breakpoint "vla1-deallocated"
|
|
gdb_test "print vla1(3, 6, 9)" "no such vector element \\\(vector not allocated\\\)" \
|
|
"print allocated vla1(3,6,9) after specific assignment (deallocated)"
|
|
gdb_test "print vla1(1, 3, 8)" "no such vector element \\\(vector not allocated\\\)" \
|
|
"print allocated vla1(1,3,8) after specific assignment (deallocated)"
|
|
gdb_test "print vla1(9, 9, 9)" "no such vector element \\\(vector not allocated\\\)" \
|
|
"print allocated vla1(9,9,9) after assignment in debugger (deallocated)"
|
|
|
|
|
|
# Try to assign VLA to user variable
|
|
clean_restart ${testfile}
|
|
|
|
if ![runto MAIN__] then {
|
|
perror "couldn't run to breakpoint MAIN__"
|
|
continue
|
|
}
|
|
gdb_breakpoint [gdb_get_line_number "vla2-allocated"]
|
|
gdb_continue_to_breakpoint "vla2-allocated"
|
|
gdb_test "next" "\\d+.*vla1\\(3, 6, 9\\) = 42" "next (1)"
|
|
|
|
gdb_test_no_output "set \$myvar = vla1" "set \$myvar = vla1"
|
|
gdb_test "print \$myvar" \
|
|
" = \\( *\\( *\\( *1311, *1311, *1311,\[()1311, .\]*\\)" \
|
|
"print \$myvar set to vla1"
|
|
|
|
gdb_test "next" "\\d+.*vla1\\(1, 3, 8\\) = 1001" "next (2)"
|
|
gdb_test "print \$myvar(3,6,9)" " = 1311" "print \$myvar(3,6,9)"
|
|
|
|
gdb_breakpoint [gdb_get_line_number "pvla-associated"]
|
|
gdb_continue_to_breakpoint "pvla-associated"
|
|
gdb_test_no_output "set \$mypvar = pvla" "set \$mypvar = pvla"
|
|
gdb_test "print \$mypvar(1,3,8)" " = 1001" "print \$mypvar(1,3,8)"
|
|
|
|
# deallocate pointer and make sure user defined variable still has the
|
|
# right value.
|
|
gdb_breakpoint [gdb_get_line_number "pvla-deassociated"]
|
|
gdb_continue_to_breakpoint "pvla-deassociated"
|
|
gdb_test "print \$mypvar(1,3,8)" " = 1001" \
|
|
"print \$mypvar(1,3,8) after deallocated"
|