[gdb/cli] Honour 'print pretty' when printing result of finish command
Consider this testcase: ... struct s { int a; int b; }; struct s foo () { struct s r; r.a = 1; r.b = 2; return r; } int main (void) { struct s v; v = foo (); return v.a + v.b; } ... When we compile it with -g, load the exec with gdb, and run till the end of foo, we can print r: ... (gdb) p r $1 = {a = 1, b = 2} ... and by setting pretty printing to on, we can get the fields of r printed each on its own line: ... (gdb) set print pretty (gdb) p r $2 = { a = 1, b = 2 } ... However, when we finish foo, the printed function result value is not using the pretty printing setting: ... (gdb) finish Run till exit from #0 foo () at test.c:11 0x00000000004004c1 in main () at test.c:18 18 v = foo (); Value returned is $3 = {a = 1, b = 2} ... This patch fixes that by using get_user_print_options instead of get_no_prettyformat_print_options in print_return_value_1, which gives us: ... (gdb) finish Run till exit from #0 foo () at test.c:11 0x00000000004004c1 in main () at test.c:18 18 v = foo (); Value returned is $2 = { a = 1, b = 2 } ... Build & reg-tested on x86_64. 2018-06-14 Tom de Vries <tdevries@suse.de> PR cli/22573 * infcmd.c (print_return_value_1): Use get_user_print_options instead of get_no_prettyformat_print_options. * gdb.base/finish-pretty.c: New test. * gdb.base/finish-pretty.exp: New file.
This commit is contained in:
parent
1f6f5dba57
commit
5d9a060879
@ -1,3 +1,9 @@
|
||||
2018-06-14 Tom de Vries <tdevries@suse.de>
|
||||
|
||||
PR cli/22573
|
||||
* infcmd.c (print_return_value_1): Use get_user_print_options instead of
|
||||
get_no_prettyformat_print_options.
|
||||
|
||||
2018-06-13 Simon Marchi <simon.marchi@ericsson.com>
|
||||
|
||||
* sparc-nat.h: Include target.h.
|
||||
|
@ -1687,7 +1687,7 @@ print_return_value_1 (struct ui_out *uiout, struct return_value_info *rv)
|
||||
uiout->field_fmt ("gdb-result-var", "$%d",
|
||||
rv->value_history_index);
|
||||
uiout->text (" = ");
|
||||
get_no_prettyformat_print_options (&opts);
|
||||
get_user_print_options (&opts);
|
||||
|
||||
string_file stb;
|
||||
|
||||
|
@ -1,3 +1,9 @@
|
||||
2018-06-14 Tom de Vries <tdevries@suse.de>
|
||||
|
||||
PR cli/22573
|
||||
* gdb.base/finish-pretty.c: New test.
|
||||
* gdb.base/finish-pretty.exp: New file.
|
||||
|
||||
2018-06-14 Pedro Alves <palves@redhat.com>
|
||||
|
||||
* gdb.gdb/selftest.exp (test_with_self): Use multi_line to build
|
||||
|
41
gdb/testsuite/gdb.base/finish-pretty.c
Normal file
41
gdb/testsuite/gdb.base/finish-pretty.c
Normal file
@ -0,0 +1,41 @@
|
||||
/* This testcase is part of GDB, the GNU debugger.
|
||||
|
||||
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 <http://www.gnu.org/licenses/>. */
|
||||
|
||||
struct s
|
||||
{
|
||||
int a;
|
||||
int b;
|
||||
};
|
||||
|
||||
static struct s
|
||||
foo (void)
|
||||
{
|
||||
struct s r;
|
||||
r.a = 1;
|
||||
r.b = 2;
|
||||
return r;
|
||||
}
|
||||
|
||||
int
|
||||
main (void)
|
||||
{
|
||||
struct s v;
|
||||
|
||||
v = foo ();
|
||||
|
||||
return v.a + v.b;
|
||||
}
|
37
gdb/testsuite/gdb.base/finish-pretty.exp
Normal file
37
gdb/testsuite/gdb.base/finish-pretty.exp
Normal file
@ -0,0 +1,37 @@
|
||||
# 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 <http://www.gnu.org/licenses/>.
|
||||
|
||||
# Check whether finish respects the print pretty user setting when printing the
|
||||
# function result.
|
||||
|
||||
standard_testfile
|
||||
|
||||
if { [prepare_for_testing "failed to prepare" $testfile $srcfile] } {
|
||||
return -1
|
||||
}
|
||||
|
||||
proc finish_pretty { } {
|
||||
if ![runto foo] {
|
||||
fail "can't run to foo"
|
||||
return
|
||||
}
|
||||
gdb_test_no_output "set print pretty" \
|
||||
"pretty printing switched on"
|
||||
gdb_test "finish" \
|
||||
{.*Value returned is \$1 = \{\r\n a = 1, \r\n b = 2\r\n\}} \
|
||||
"finish foo prettyprinted function result"
|
||||
}
|
||||
|
||||
finish_pretty
|
Loading…
Reference in New Issue
Block a user