diff options
| -rw-r--r-- | gdb/f-lang.c | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.fortran/nested-funcs-2.exp | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/gdb/f-lang.c b/gdb/f-lang.c index ce7f1471c52..5681379b3b3 100644 --- a/gdb/f-lang.c +++ b/gdb/f-lang.c @@ -673,9 +673,9 @@ extern const struct language_defn f_language_defn = default_pass_by_reference, default_get_string, c_watch_location_expression, - NULL, /* la_get_symbol_name_matcher */ + cp_get_symbol_name_matcher, /* la_get_symbol_name_matcher */ iterate_over_symbols, - default_search_name_hash, + cp_search_name_hash, &default_varobj_ops, NULL, NULL, diff --git a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp index e23d8bad4b2..9fa04ae9af3 100644 --- a/gdb/testsuite/gdb.fortran/nested-funcs-2.exp +++ b/gdb/testsuite/gdb.fortran/nested-funcs-2.exp @@ -121,12 +121,6 @@ proc do_bp_tests {with_src_prefix_p with_nest_prefix_p} { ".*print \\\*, program_i ! post_hidden" gdb_test "p program_i" " = 30" "printing hidden global" - # Check that the methods in the container module still require the - # module name as context. - gdb_test_no_output "set confirm off" - gdb_test "break print_from_module" \ - "Function \\\"print_from_module\\\" not defined." - # Check info symbol, whatis and ptype can find information on # these nested functions. foreach entry \ @@ -147,10 +141,7 @@ proc do_bp_tests {with_src_prefix_p with_nest_prefix_p} { } foreach_with_prefix src_prefix { 0 1 } { - # For now this loop is only run with a value of '1'. A later - # patch will extend this with the value '0', at which point this - # comment will be removed. - foreach_with_prefix nest_prefix { 1 } { + foreach_with_prefix nest_prefix { 0 1 } { do_bp_tests ${src_prefix} ${nest_prefix} } } |