forked from Imagelibrary/binutils-gdb
dae2db38eb
This patch is a rebase and update of the following three patches: https://sourceware.org/ml/gdb-patches/2018-11/msg00298.html https://sourceware.org/ml/gdb-patches/2018-11/msg00302.html https://sourceware.org/ml/gdb-patches/2018-11/msg00301.html I have merged these together into a single commit as the second patch, adding scope support to nested subroutines, means that some of the changes in the first patch are now no longer useful and would have to be backed out. The third patch is tightly coupled to the changes in the second of these patches and I think deserves to live together with it. There is an extra change in cp-namespace.c that is new, this resolves an issue with symbol lookup when placing breakpoints from within nested subroutines. There is also an extra test added to this commit 'nested-funcs-2.exp' that was written by Richard Bunt from ARM, this offers some additional testing of breakpoints on nested functions. After this commit it is possible to place breakpoints on nested Fortran subroutines and functions by using a fully scoped name, for example, given this simple Fortran program: program greeting call message contains subroutine message print *, "Hello World" end subroutine message end program greeting It is possible to place a breakpoint in 'message' with: (gdb) break greeting::message Breakpoint 1 at 0x4006c9: file basic.f90, line 5. What doesn't work with this commit is placing a breakpoint like this: (gdb) break message Function "message" not defined. Making this work will come in a later commit. gdb/ChangeLog: * cp-namespace.c (cp_search_static_and_baseclasses): Only search for nested static variables when searchin VAR_DOMAIN. * dwarf2read.c (add_partial_symbol): Add nested subroutines to the global scope, update comment. (add_partial_subprogram): Call add_partial_subprogram recursively for nested subroutines when processinng Fortran. (load_partial_dies): Process the child entities of a subprogram when processing Fortran. (partial_die_parent_scope): Handle building scope for Fortran nested functions. (process_die): Record that nested functions have a scope. (new_symbol): Always record Fortran subprograms on the global symbol list. (determine_prefix): How to build the prefix for Fortran subprograms. gdb/testsuite/ChangeLog: * gdb.fortran/nested-funcs.exp: Tests for placing breakpoints on nested functions. * gdb.fortran/nested-funcs.f90: Update expected results. * gdb.fortran/nested-funcs-2.exp: New file. * gdb.fortran/nested-funcs-2.f90: New file. gdb/doc/ChangeLog: * doc/gdb.texinfo (Fortran Operators): Describe scope operator.
84 lines
3.6 KiB
Plaintext
Executable File
84 lines
3.6 KiB
Plaintext
Executable File
# Copyright 2016-2019 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/>.
|
|
|
|
# This testcase is supposed to test DWARF static link which is usually
|
|
# used together with nested functions.
|
|
|
|
if { [skip_fortran_tests] } { return -1 }
|
|
|
|
standard_testfile .f90
|
|
load_lib "fortran.exp"
|
|
|
|
if {[prepare_for_testing "failed to prepare" $testfile $srcfile {debug f90}]} {
|
|
return -1
|
|
}
|
|
|
|
if ![runto MAIN__] then {
|
|
perror "couldn't run to breakpoint MAIN__"
|
|
continue
|
|
|
|
# Test if we can set a breakpoint in a nested function
|
|
gdb_breakpoint "testnestedfuncs::sub_nested_outer"
|
|
gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_outer" ".*local_int = 19"
|
|
|
|
# Test if we can access local and
|
|
# non-local variables defined one level up.
|
|
gdb_breakpoint [gdb_get_line_number "! BP_outer"]
|
|
gdb_continue_to_breakpoint "! BP_outer" ".*! BP_outer"
|
|
gdb_test "print index" "= 13" "print index at BP_outer"
|
|
gdb_test_no_output "set variable index = 42"
|
|
gdb_test "print index" "= 42" "print index at BP_outer, manipulated"
|
|
gdb_test "print local_int" "= 19" "print local_int in outer function"
|
|
|
|
# Non-local variable should be affected in one frame up as well.
|
|
gdb_test "up"
|
|
gdb_test "print index" "= 42" "print index at BP1, one frame up"
|
|
|
|
# Test if we can set a breakpoint in a nested function
|
|
gdb_breakpoint "testnestedfuncs::sub_nested_inner"
|
|
gdb_continue_to_breakpoint "testnestedfuncs::sub_nested_inner" ".*local_int = 17"
|
|
|
|
# Test if we can access local and
|
|
# non-local variables defined two level up.
|
|
gdb_breakpoint [gdb_get_line_number "! BP_inner"]
|
|
gdb_continue_to_breakpoint "! BP_inner" ".*! BP_inner"
|
|
gdb_test "print index" "= 42" "print index at BP_inner"
|
|
gdb_test "print v_state%code" "= 61" "print v_state%code at BP_inner"
|
|
gdb_test "print local_int" "= 17" "print local_int in inner function"
|
|
|
|
# Test if local variable is still correct.
|
|
gdb_breakpoint [gdb_get_line_number "! BP_outer_2"]
|
|
gdb_continue_to_breakpoint "! BP_outer_2" ".*! BP_outer_2"
|
|
gdb_test "print local_int" "= 19" \
|
|
"print local_int in outer function, after sub_nested_inner"
|
|
|
|
# Test if we can set a breakpoint in public routine with the same name as the internal
|
|
gdb_breakpoint "sub_nested_outer"
|
|
gdb_continue_to_breakpoint "sub_nested_outer" ".*name = 'sub_nested_outer external'"
|
|
|
|
# Test if we can set a breakpoint in public routine with the same name as the internal
|
|
gdb_breakpoint "sub_with_sub_nested_outer::sub_nested_outer"
|
|
gdb_continue_to_breakpoint "sub_with_sub_nested_outer::sub_nested_outer" ".*local_int = 11"
|
|
|
|
# Test if we can set a breakpoint in public routine with the same name as the internal
|
|
gdb_breakpoint "mod1::sub_nested_outer"
|
|
gdb_continue_to_breakpoint "mod1::sub_nested_outer" ".*name = 'sub_nested_outer_mod1'"
|
|
|
|
# Sanity check in main.
|
|
gdb_breakpoint [gdb_get_line_number "! BP_main"]
|
|
gdb_continue_to_breakpoint "! BP_main" ".*! BP_main"
|
|
gdb_test "print index" "= 42" "print index at BP_main"
|
|
gdb_test "print v_state%code" "= 59" "print v_state%code at BP_main"
|