From patchwork Sat Jun 9 17:07:53 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 27725 Received: (qmail 22623 invoked by alias); 9 Jun 2018 17:07:59 -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 22604 invoked by uid 89); 9 Jun 2018 17:07:58 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.2 spammy=H*MI:localhost, va, rb, reg-tested X-HELO: mx2.suse.de Received: from mx2.suse.de (HELO mx2.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sat, 09 Jun 2018 17:07:56 +0000 Received: from relay2.suse.de (charybdis-ext-too.suse.de [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 84F8AAC44 for ; Sat, 9 Jun 2018 17:07:54 +0000 (UTC) Date: Sat, 9 Jun 2018 19:07:53 +0200 From: Tom de Vries To: gdb-patches@sourceware.org Subject: [PATCH][PR cli/22573] Honour 'print pretty' when printing result of finish command Message-ID: <20180609170752.2s4kdlyhat5d5bnn@localhost.localdomain> MIME-Version: 1.0 Content-Disposition: inline User-Agent: NeoMutt/20170912 (1.9.0) Hi, this fixes PR22573 - "finish" doesn't respect "set print pretty". 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. OK for trunk? Thanks, - Tom [gdb/cli] Honour 'print pretty' when printing result of finish command 2018-06-08 Tom de Vries 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. --- gdb/infcmd.c | 2 +- gdb/testsuite/gdb.base/finish-pretty.c | 24 ++++++++++++++++++++++ gdb/testsuite/gdb.base/finish-pretty.exp | 34 ++++++++++++++++++++++++++++++++ 3 files changed, 59 insertions(+), 1 deletion(-) diff --git a/gdb/infcmd.c b/gdb/infcmd.c index b3f0238eba..5c5faf7e28 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; diff --git a/gdb/testsuite/gdb.base/finish-pretty.c b/gdb/testsuite/gdb.base/finish-pretty.c new file mode 100644 index 0000000000..5d30b1c16d --- /dev/null +++ b/gdb/testsuite/gdb.base/finish-pretty.c @@ -0,0 +1,24 @@ +struct s +{ + int a; + int b; +}; + +static struct s __attribute((noinline, noclone)) +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; +} diff --git a/gdb/testsuite/gdb.base/finish-pretty.exp b/gdb/testsuite/gdb.base/finish-pretty.exp new file mode 100644 index 0000000000..52852c7bad --- /dev/null +++ b/gdb/testsuite/gdb.base/finish-pretty.exp @@ -0,0 +1,34 @@ +# 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 . + +if { [prepare_for_testing "failed to prepare" finish-pretty finish-pretty.c] } { + return -1 +} + +proc finish_pretty { } { + global gdb_prompt + + gdb_test "break foo" "Breakpoint \[0123456789\].*" \ + "set break on foo" + gdb_test "run" "Breakpoint.* foo.*" \ + "run to foo" + gdb_test "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" +} + +finish_pretty +