aboutsummaryrefslogtreecommitdiff
path: root/gdb/infcmd.c
diff options
context:
space:
mode:
authorTom de Vries <tdevries@suse.de>2018-06-08 12:37:53 +0200
committerTom de Vries <tdevries@suse.de>2018-06-14 15:30:47 +0200
commit5d9a06087942ddf4f9ab724b5b4c1a45507d8321 (patch)
treed2d53909c7cf4eb2ad7cf7124b4e5a333e889ac2 /gdb/infcmd.c
parent1f6f5dba57ffbc073b1ead89647288feaaed2caf (diff)
downloadfsf-binutils-gdb-5d9a06087942ddf4f9ab724b5b4c1a45507d8321.zip
fsf-binutils-gdb-5d9a06087942ddf4f9ab724b5b4c1a45507d8321.tar.gz
fsf-binutils-gdb-5d9a06087942ddf4f9ab724b5b4c1a45507d8321.tar.bz2
[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.
Diffstat (limited to 'gdb/infcmd.c')
-rw-r--r--gdb/infcmd.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gdb/infcmd.c b/gdb/infcmd.c
index b3f0238..5c5faf7 100644
--- a/gdb/infcmd.c
+++ b/gdb/infcmd.c
@@ -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;