From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 61422 invoked by alias); 27 Jun 2019 13:53:57 -0000 Mailing-List: contact gdb-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: gdb-cvs-owner@sourceware.org List-Subscribe: Sender: gdb-cvs-owner@sourceware.org Received: (qmail 61377 invoked by uid 306); 27 Jun 2019 13:53:57 -0000 Date: Thu, 27 Jun 2019 13:53:00 -0000 Message-ID: <20190627135357.61375.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Tom Tromey To: gdb-cvs@sourceware.org Subject: [binutils-gdb] Fix two buglets in cp_print_value_fields patch X-Act-Checkin: binutils-gdb X-Git-Author: Tom Tromey X-Git-Refname: refs/heads/master X-Git-Oldrev: ba85f98c42877287f45644a6d75513239c9490a5 X-Git-Newrev: 3d507ff23b724ecb2b9a5a61cebd0fba275cfbc3 X-SW-Source: 2019-06/txt/msg00212.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=3d507ff23b724ecb2b9a5a61cebd0fba275cfbc3 commit 3d507ff23b724ecb2b9a5a61cebd0fba275cfbc3 Author: Tom Tromey Date: Tue Jun 18 09:37:02 2019 -0600 Fix two buglets in cp_print_value_fields patch Pedro and Tom both pointed out issues in the cp_print_value_fields patch, aka the fix for PR c++/20020. This patch addresses both issues. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-06-27 Tom Tromey * cp-valprint.c (cp_print_value_fields): Pass opts, not options, to cp_print_static_field. gdb/testsuite/ChangeLog 2019-06-27 Tom Tromey * gdb.cp/constexpr-field.exp: Use setup_xfail. Diff: --- gdb/ChangeLog | 5 +++++ gdb/cp-valprint.c | 2 +- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.cp/constexpr-field.exp | 3 ++- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f06d13e..28a0df3 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2019-06-27 Tom Tromey + + * cp-valprint.c (cp_print_value_fields): Pass opts, not options, + to cp_print_static_field. + 2019-06-26 Tom Tromey * minsyms.c (lookup_minimal_symbol_solib_trampoline): Remove. diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 5781d7a..d3a38d8 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -302,7 +302,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, cp_print_static_field (TYPE_FIELD_TYPE (type, i), v, stream, recurse + 1, - options); + opts); } catch (const gdb_exception_error &ex) { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 10a38a2..2347a4a 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2019-06-27 Tom Tromey + + * gdb.cp/constexpr-field.exp: Use setup_xfail. + 2019-06-26 Tom de Vries * gdb.dwarf2/varval.exp: Compile twice, once without bad DWARF. diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp index e4849ef..2f71cef 100644 --- a/gdb/testsuite/gdb.cp/constexpr-field.exp +++ b/gdb/testsuite/gdb.cp/constexpr-field.exp @@ -31,6 +31,7 @@ if {![runto_main]} { # "x" sometimes isn't available due to # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90526 -gdb_test "print x" " = {static f = .*}" +setup_xfail *-*-* gcc/90526 +gdb_test "print x" " = {static f = true}" gdb_test "print y" " = {static f = true}"