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