From patchwork Fri Jan 5 16:34:39 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pedro Alves X-Patchwork-Id: 25234 Received: (qmail 12472 invoked by alias); 5 Jan 2018 16:34:46 -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 12458 invoked by uid 89); 5 Jan 2018 16:34:45 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.4 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_STOCKGEN, SPF_HELO_PASS, T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=4476, Hx-languages-length:4814 X-HELO: mx1.redhat.com Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 05 Jan 2018 16:34:44 +0000 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id AD7DE5B30A; Fri, 5 Jan 2018 16:36:14 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 664B5605E1; Fri, 5 Jan 2018 16:34:40 +0000 (UTC) Subject: Fix gdb.ada/bp_c_mixed_case.exp (PR gdb/22670) (Re: [PATCH 3/3] Add new gdb.ada/bp_c_mixed_case testcase for PR gdb/22670) To: Joel Brobecker , gdb-patches@sourceware.org References: <1515054953-81012-1-git-send-email-brobecker@adacore.com> <1515054953-81012-4-git-send-email-brobecker@adacore.com> From: Pedro Alves Message-ID: Date: Fri, 5 Jan 2018 16:34:39 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.5.0 MIME-Version: 1.0 In-Reply-To: <1515054953-81012-4-git-send-email-brobecker@adacore.com> On 01/04/2018 08:35 AM, Joel Brobecker wrote: > This patch adds a new testcase to demonstrate a regression introduced by: > > commit b5ec771e60c1a0863e51eb491c85c674097e9e13 > Date: Wed Nov 8 14:22:32 2017 +0000 > Subject: Introduce lookup_name_info and generalize Ada's FULL/WILD name matching > > The purpose of the testcase is to verify that a user can insert > a breakpoint on a C function while debugging Ada, even if the name > of the function includes uppercase letters, requiring us to use > Ada's "<...>" notation to tell the GDB that the symbol name should > be looked up verbatim. > > As of the commit above, GDB is no longer finding the function: > > (gdb) break > Function "" not defined. > Make breakpoint pending on future shared library load? (y or [n]) > > Before the patch, the breakpoint was inserted without problem. > Below's a fix for this one. I've force-pushed this one along with the following on to the users/palves/literal-matching branch, rebased on master to pick up the other fixes that went in meanwhile. From 439f8c51ff8f6cd9fb3bbc330a40492a15992add Mon Sep 17 00:00:00 2001 From: Pedro Alves Date: Fri, 5 Jan 2018 00:17:19 +0000 Subject: [PATCH 1/2] Fix gdb.ada/bp_c_mixed_case.exp (PR gdb/22670) The problem here is that we were using the user-provided lookup name literally for linkage name comparisons. I.e., "" with the "<>"s included. That obviously can't work since the "<>" are not really part of the linkage name. The original idea was that we'd use the symbol's language to select the right symbol name matching algorithm, but that doesn't work for Ada because it's not really possible to unambiguously tell from the linkage name alone whether we're dealing with Ada symbols, so Ada minsyms end up with no language set, or sometimes C++ set. So fix this by treating Ada mode specially when determining the linkage name to match against. gdb/ChangeLog: yyyy-mm-dd Pedro Alves PR gdb/22670 * minsyms.c (linkage_name_str): New function. (iterate_over_minimal_symbols): Use it. gdb/testsuite/ChangeLog: yyyy-mm-dd Pedro Alves PR gdb/22670 * gdb.ada/bp_c_mixed_case.exp: Remove setup_kfail calls. --- gdb/minsyms.c | 21 ++++++++++++++++++++- gdb/testsuite/gdb.ada/bp_c_mixed_case.exp | 4 +--- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/gdb/minsyms.c b/gdb/minsyms.c index 26c91ec8819..fded0d65e93 100644 --- a/gdb/minsyms.c +++ b/gdb/minsyms.c @@ -447,6 +447,25 @@ find_minimal_symbol_address (const char *name, CORE_ADDR *addr, return sym.minsym == NULL; } +/* Get the lookup name form best suitable for linkage name + matching. */ + +static const char * +linkage_name_str (const lookup_name_info &lookup_name) +{ + /* Unlike most languages (including C++), Ada uses the + encoded/linkage name as the search name recorded in symbols. So + if debugging in Ada mode, prefer the Ada-encoded name. This also + makes Ada's verbatim match syntax ("<...>") work, because + "lookup_name.name()" includes the "<>"s, while + "lookup_name.ada().lookup_name()" is the encoded name with "<>"s + stripped. */ + if (current_language->la_language == language_ada) + return lookup_name.ada ().lookup_name ().c_str (); + + return lookup_name.name ().c_str (); +} + /* See minsyms.h. */ void @@ -459,7 +478,7 @@ iterate_over_minimal_symbols (struct objfile *objf, /* The first pass is over the ordinary hash table. */ { - const char *name = lookup_name.name ().c_str (); + const char *name = linkage_name_str (lookup_name); unsigned int hash = msymbol_hash (name) % MINIMAL_SYMBOL_HASH_SIZE; auto *mangled_cmp = (case_sensitivity == case_sensitive_on diff --git a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp index 54c61e3a8e8..7787646c67f 100644 --- a/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp +++ b/gdb/testsuite/gdb.ada/bp_c_mixed_case.exp @@ -40,13 +40,11 @@ gdb_test "show lang" \ # Try inserting a breakpoint inside a C function. Because the function's # name has some uppercase letters, we need to use the "<...>" notation. # The purpose of this testcase is to verify that we can in fact do so -# and that it inserts the breakpoint at the expected location. -setup_kfail gdb/22670 "*-*-*" +# and that it inserts the breakpoint at the expected location. See gdb/22670. gdb_test "break " \ "Breakpoint $decimal at $hex: file .*bar.c, line $decimal\\." # Resume the program's execution, verifying that it lands at the expected # location. -setup_kfail gdb/22670 "*-*-*" gdb_test "continue" \ "Breakpoint $decimal, MixedCaseFunc \\(\\) at .*bar\\.c:$decimal.*"