From aa3b653351504e262fb455af5efb6eea6d981597 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Thu, 6 Jun 2019 11:20:51 -0600 Subject: [PATCH] Allow nested function displays In Ada, it's possible to have nested functions. However, block.c:contained_in does not recognize this. Normally, this is no problem, but if gdb is stopped inside a nested function, then you can end up in the unexpected situation that "print" of an expression will work, whereas "display" of the same expression will not -- because contained_in returns 0. This patch simply removes the BLOCK_FUNCTION check from contained_in. The rationale here is that in languages without nested functions, this will not cause any issues. gdb/ChangeLog 2019-07-30 Tom Tromey * block.c (contained_in): Remove BLOCK_FUNCTION check. gdb/testsuite/ChangeLog 2019-07-30 Tom Tromey * gdb.ada/display_nested.exp: New file. * gdb.ada/display_nested/foo.adb: New file. * gdb.ada/display_nested/pack.adb: New file. * gdb.ada/display_nested/pack.ads: New file. --- gdb/ChangeLog | 4 +++ gdb/block.c | 4 --- gdb/testsuite/ChangeLog | 7 +++++ gdb/testsuite/gdb.ada/display_nested.exp | 29 ++++++++++++++++++ gdb/testsuite/gdb.ada/display_nested/foo.adb | 30 +++++++++++++++++++ gdb/testsuite/gdb.ada/display_nested/pack.adb | 23 ++++++++++++++ gdb/testsuite/gdb.ada/display_nested/pack.ads | 20 +++++++++++++ 7 files changed, 113 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.ada/display_nested.exp create mode 100644 gdb/testsuite/gdb.ada/display_nested/foo.adb create mode 100644 gdb/testsuite/gdb.ada/display_nested/pack.adb create mode 100644 gdb/testsuite/gdb.ada/display_nested/pack.ads diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4d9ec41c696..44ab7226fad 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,7 @@ +2019-07-30 Tom Tromey + + * block.c (contained_in): Remove BLOCK_FUNCTION check. + 2019-07-30 Kevin Buettner * printcmd.c (print_address_symbolic): Print negative offsets. diff --git a/gdb/block.c b/gdb/block.c index 63c7d9f3955..5c6faa85045 100644 --- a/gdb/block.c +++ b/gdb/block.c @@ -79,10 +79,6 @@ contained_in (const struct block *a, const struct block *b) { if (a == b) return 1; - /* If A is a function block, then A cannot be contained in B, - except if A was inlined. */ - if (BLOCK_FUNCTION (a) != NULL && !block_inlined_p (a)) - return 0; a = BLOCK_SUPERBLOCK (a); } while (a != NULL); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 8dde64d4b08..d88157cb0da 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2019-07-30 Tom Tromey + + * gdb.ada/display_nested.exp: New file. + * gdb.ada/display_nested/foo.adb: New file. + * gdb.ada/display_nested/pack.adb: New file. + * gdb.ada/display_nested/pack.ads: New file. + 2019-07-30 Christian Biesinger * gdb.python/py-symbol.c: Add a static variable and one in an anonymous diff --git a/gdb/testsuite/gdb.ada/display_nested.exp b/gdb/testsuite/gdb.ada/display_nested.exp new file mode 100644 index 00000000000..9a66264881e --- /dev/null +++ b/gdb/testsuite/gdb.ada/display_nested.exp @@ -0,0 +1,29 @@ +# Copyright 2019 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" + +standard_ada_testfile foo + +if {[gdb_compile_ada "${srcfile}" "${binfile}" executable debug] != ""} { + return -1 +} + +clean_restart ${testfile} + +set bp_location [gdb_get_line_number "BREAK" ${testdir}/foo.adb] +runto "foo.adb:$bp_location" + +gdb_test "display s(I..I+5)" [string_to_regexp "1: s(I..I+5) = \"test s\""] diff --git a/gdb/testsuite/gdb.ada/display_nested/foo.adb b/gdb/testsuite/gdb.ada/display_nested/foo.adb new file mode 100644 index 00000000000..543e993ea48 --- /dev/null +++ b/gdb/testsuite/gdb.ada/display_nested/foo.adb @@ -0,0 +1,30 @@ +-- Copyright 2019 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 Pack; use Pack; + +procedure Foo is + S : String := "test string"; + I : Natural := S'First; +begin + declare + procedure Nested is + begin + Do_Nothing (S); -- BREAK + end Nested; + begin + Nested; + end; +end Foo; diff --git a/gdb/testsuite/gdb.ada/display_nested/pack.adb b/gdb/testsuite/gdb.ada/display_nested/pack.adb new file mode 100644 index 00000000000..fa2d6073117 --- /dev/null +++ b/gdb/testsuite/gdb.ada/display_nested/pack.adb @@ -0,0 +1,23 @@ +-- Copyright 2019 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 Pack is + + procedure Do_Nothing (S : String) is + begin + null; + end Do_Nothing; + +end Pack; diff --git a/gdb/testsuite/gdb.ada/display_nested/pack.ads b/gdb/testsuite/gdb.ada/display_nested/pack.ads new file mode 100644 index 00000000000..133d070b96a --- /dev/null +++ b/gdb/testsuite/gdb.ada/display_nested/pack.ads @@ -0,0 +1,20 @@ +-- Copyright 2019 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 Pack is + + procedure Do_Nothing (S : String); + +end Pack; -- 2.30.2