From patchwork Tue Sep 3 21:39:00 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrew Burgess X-Patchwork-Id: 34380 Received: (qmail 82679 invoked by alias); 3 Sep 2019 21:39:12 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 82607 invoked by uid 89); 3 Sep 2019 21:39:11 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.5 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=1.2, 1.3 X-HELO: mail-wr1-f41.google.com Received: from mail-wr1-f41.google.com (HELO mail-wr1-f41.google.com) (209.85.221.41) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Sep 2019 21:39:10 +0000 Received: by mail-wr1-f41.google.com with SMTP id j16so19012304wrr.8 for ; Tue, 03 Sep 2019 14:39:09 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=RZB9eT3mQ04brIBirqy5lzEo+MqOuPTWSgyVWiaYH60=; b=ee/LK+ONjlKZQMVGgmDjAhsJ6mvAa41MX935bxsBj6rVuNf4Qpjcr9ZmCdXS/bfK7A Y4DS8vGBEjkGgIANoVyxGj9xHkIiACa3/0VkAliS2/EIL/TxM5LGekuW0PnNLJICS+Uj FTeJtBlUf80TlIOWtKQordUhVQMmimurvyQsJ1FKtww1uv4a1eLuZUK3zy9kYJf891Fg atcp3BJUu5duqclVsqZcNmwMhCJLbGTar/GQuG4lmbljxN46mqJL00V5tLTuxWkrXFrr EurdQ+PadvZSu876rmjLHOPUc64no28poZ12H+R3Sg7Lg60MG6cV/LmSRXh/SZP2lqj/ IFEw== Return-Path: Received: from localhost (host86-161-16-231.range86-161.btcentralplus.com. [86.161.16.231]) by smtp.gmail.com with ESMTPSA id e15sm19763764wrj.74.2019.09.03.14.39.06 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 03 Sep 2019 14:39:06 -0700 (PDT) From: Andrew Burgess To: gdb-patches@sourceware.org Cc: Richard Bunt , Andrew Burgess Subject: [PATCH 2/2] gdb/fortran: Allow for matching symbols with missing scope Date: Tue, 3 Sep 2019 22:39:00 +0100 Message-Id: In-Reply-To: References: In-Reply-To: References: X-IsSubscribed: yes This commit allows symbol matching within Fortran code without having to specify all of the symbol's scope. For example, given this Fortran code: module aaa contains subroutine foo print *, "hello." end subroutine foo end module aaa subroutine foo print *, "hello." end subroutine foo program test call foo contains subroutine foo print *, "hello." end subroutine foo subroutine bar use aaa call foo end subroutine bar end program test The user can now do this: (gdb) b foo Breakpoint 1 at 0x4006c2: foo. (3 locations) (gdb) info breakpoints Num Type Disp Enb Address What 1 breakpoint keep y 1.1 y 0x00000000004006c2 in aaa::foo at nest.f90:4 1.2 y 0x0000000000400730 in foo at nest.f90:9 1.3 y 0x00000000004007c3 in test::foo at nest.f90:16 The user asks for a breakpoint on 'foo' and is given a breakpoint on all three possible 'foo' locations. The user is, of course, still able to specify the scope in order to place a single breakpoint on just one of the foo functions (or use 'break -qualified foo' to break on just the global foo). gdb/ChangeLog: * f-lang.c (f_language_defn): Use cp_get_symbol_name_matcher and cp_search_name_hash. gdb/testsuite/ChangeLog: * gdb.fortran/nested-funcs-2.exp: Run tests with and without the nested function prefix. --- gdb/ChangeLog | 5 +++++ gdb/f-lang.c | 4 ++-- gdb/testsuite/ChangeLog | 5 +++++ gdb/testsuite/gdb.fortran/nested-funcs-2.exp | 11 +---------- 4 files changed, 13 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} } }