From patchwork Mon Jan 29 10:38:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joel Brobecker X-Patchwork-Id: 25658 Received: (qmail 4222 invoked by alias); 29 Jan 2018 10:38:56 -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 4204 invoked by uid 89); 29 Jan 2018 10:38:55 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-25.1 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.2 spammy=lucky! X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 29 Jan 2018 10:38:48 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 071C9562FD; Mon, 29 Jan 2018 05:38:47 -0500 (EST) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id pgj2ZAcDou-p; Mon, 29 Jan 2018 05:38:46 -0500 (EST) Received: from joel.gnat.com (localhost.localdomain [127.0.0.1]) by rock.gnat.com (Postfix) with ESMTP id 7FA66562F4; Mon, 29 Jan 2018 05:38:46 -0500 (EST) Received: by joel.gnat.com (Postfix, from userid 1000) id EE93683307; Mon, 29 Jan 2018 14:38:41 +0400 (+04) Date: Mon, 29 Jan 2018 14:38:41 +0400 From: Joel Brobecker To: Pedro Alves Cc: gdb-patches@sourceware.org Subject: Re: [RFC] regresssion(internal-error) printing subprogram argument Message-ID: <20180129103841.kdkomcjbuwiat5b4@adacore.com> References: <20171215094755.dwocipbcwvtdm6f6@adacore.com> <00320239-44c8-b9c3-013b-b27c771e3401@redhat.com> <07a154ef-b6f5-ad86-1410-a73620de4b5b@redhat.com> <20180103043345.n6blge377ybsdx6q@adacore.com> <8df5cf8b-6e4e-e310-fcbd-2615334fe5b9@redhat.com> <832dbb30-7c2b-40ed-c03c-654bd1e2ea32@redhat.com> <20180117091332.z7bqu4aljudq33sw@adacore.com> <20180126035055.vbjtowj6q5ftbwiz@adacore.com> <21bfbb6a-bb10-812b-c34a-d367321e8d5e@redhat.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <21bfbb6a-bb10-812b-c34a-d367321e8d5e@redhat.com> User-Agent: NeoMutt/20170113 (1.7.2) > Indeed, looks like I don't have that. I have "interfacesS". > I've attached the whole file. That explains it :). > So it may be that we still need to add another special case > for Ada somewhere. Would old GDB from before the C++ > wildmatching pass this test for you? I went binary searching for the source of the regression and when I found that it was "caused" by the change requiring variables without debugging information to be cast before they can be printed, I gently head-slapped myself, adjusted the testcase to use something other than an integer variable, and voila - even GDB 7.10 suffers from the problem. We just didn't see it for integer variables simply because we were lucky! I ran out of time again today, but at least the WIP patch got augmented with a testcase that currently fails before the patch is applied. I think the patch itself is probably correct, although I'd like to do some archeology to understand the comment attached to that location. I'm pretty confused by it, when we could simply say that symbols from languages that do not follow the C++ mangling should not be demangled by gdb_demangle -- at least for as long as gdb_demangle is equivalent to cplusplus_demangle in practice... And just as a reminder for myself, I said in my other email last week that I wanted also to review all the calls to gdb_demangle. From 6f24c49e7c3ba2c6246aa3de92ef48c1315778f8 Mon Sep 17 00:00:00 2001 From: Joel Brobecker Date: Thu, 25 Jan 2018 23:23:54 -0500 Subject: [PATCH] WIP: dwarf2read.c::dwarf2_physname: do not call gdb_demangle with Ada symbols --- gdb/dwarf2read.c | 2 +- gdb/testsuite/gdb.ada/notcplusplus.exp | 45 ++++++++++++++++++++++++++++++ gdb/testsuite/gdb.ada/notcplusplus/foo.adb | 21 ++++++++++++++ gdb/testsuite/gdb.ada/notcplusplus/pck.adb | 21 ++++++++++++++ gdb/testsuite/gdb.ada/notcplusplus/pck.ads | 19 +++++++++++++ gdb/testsuite/gdb.ada/notcplusplus/ver.ads | 22 +++++++++++++++ 6 files changed, 129 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.ada/notcplusplus.exp create mode 100644 gdb/testsuite/gdb.ada/notcplusplus/foo.adb create mode 100644 gdb/testsuite/gdb.ada/notcplusplus/pck.adb create mode 100644 gdb/testsuite/gdb.ada/notcplusplus/pck.ads create mode 100644 gdb/testsuite/gdb.ada/notcplusplus/ver.ads diff --git a/gdb/dwarf2read.c b/gdb/dwarf2read.c index 51d0f39..7febade 100644 --- a/gdb/dwarf2read.c +++ b/gdb/dwarf2read.c @@ -11150,7 +11150,7 @@ dwarf2_physname (const char *name, struct die_info *die, struct dwarf2_cu *cu) variant `long name(params)' does not have the proper inferior type. */ - if (cu->language == language_go) + if (cu->language == language_go || cu->language == language_ada) { /* This is a lie, but we already lie to the caller new_symbol. new_symbol assumes we return the mangled name. diff --git a/gdb/testsuite/gdb.ada/notcplusplus.exp b/gdb/testsuite/gdb.ada/notcplusplus.exp new file mode 100644 index 0000000..b2a24e8 --- /dev/null +++ b/gdb/testsuite/gdb.ada/notcplusplus.exp @@ -0,0 +1,45 @@ +# Copyright 2018 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 . + +load_lib "ada.exp" + +if { [skip_ada_tests] } { return -1 } + +standard_ada_testfile foo + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable {debug}] != ""} { + return -1 +} + +clean_restart ${testfile} + +gdb_test "print /x " \ + "= \\(a => 0x60287af\\)" \ + "print before loading symbols from ver.ads" + +# Force the partial symbosl from ver.ads to be expanded into full symbols. + +gdb_test \ + "list ver.ads:16" \ + [multi_line ".*" \ + "16\\s+package Ver is" \ + "17\\s+type Wrapper is record" \ + "18\\s+A : Integer;" \ + "19\\s+end record;" \ + "20\\s+u00045 : constant Wrapper := \\(A => 16#060287af#\\);"] + +gdb_test "print /x " \ + "= \\(a => 0x60287af\\)" \ + "print after loading symbols from ver.ads" diff --git a/gdb/testsuite/gdb.ada/notcplusplus/foo.adb b/gdb/testsuite/gdb.ada/notcplusplus/foo.adb new file mode 100644 index 0000000..89e42f9 --- /dev/null +++ b/gdb/testsuite/gdb.ada/notcplusplus/foo.adb @@ -0,0 +1,21 @@ +-- Copyright 2018 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 . + +with Pck; use Pck; +with Ver; use Ver; +procedure Foo is +begin + Do_Nothing (u00045'Address); +end Foo; diff --git a/gdb/testsuite/gdb.ada/notcplusplus/pck.adb b/gdb/testsuite/gdb.ada/notcplusplus/pck.adb new file mode 100644 index 0000000..dcfb306 --- /dev/null +++ b/gdb/testsuite/gdb.ada/notcplusplus/pck.adb @@ -0,0 +1,21 @@ +-- Copyright 2018 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 . + +package body Pck is + procedure Do_Nothing (A : System.Address) is + begin + null; + end Do_Nothing; +end Pck; diff --git a/gdb/testsuite/gdb.ada/notcplusplus/pck.ads b/gdb/testsuite/gdb.ada/notcplusplus/pck.ads new file mode 100644 index 0000000..33e369e --- /dev/null +++ b/gdb/testsuite/gdb.ada/notcplusplus/pck.ads @@ -0,0 +1,19 @@ +-- Copyright 2018 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 . + +with System; +package Pck is + procedure Do_Nothing (A : System.Address); +end Pck; diff --git a/gdb/testsuite/gdb.ada/notcplusplus/ver.ads b/gdb/testsuite/gdb.ada/notcplusplus/ver.ads new file mode 100644 index 0000000..8f264d0 --- /dev/null +++ b/gdb/testsuite/gdb.ada/notcplusplus/ver.ads @@ -0,0 +1,22 @@ +-- Copyright 2018 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 . + +package Ver is + type Wrapper is record + A : Integer; + end record; + u00045 : constant Wrapper := (A => 16#060287af#); + pragma Export (C, u00045, "symada__cS"); +end Ver; -- 2.1.4