From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20196 invoked by alias); 2 Aug 2019 15:14:57 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 20183 invoked by uid 89); 2 Aug 2019 15:14:57 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.1 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_SHORT,SPF_PASS autolearn=ham version=3.3.1 spammy=20020, 20190529, 2019-05-29 X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 02 Aug 2019 15:14:53 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 4511FAF38; Fri, 2 Aug 2019 15:14:51 +0000 (UTC) Subject: [8.3 backport] Fix crash in cp_print_value_fields To: Tom Tromey , gdb-patches@sourceware.org Cc: Tom Tromey References: <20190517201814.27951-1-tromey@adacore.com> From: Tom de Vries Openpgp: preference=signencrypt Message-ID: <8484cf89-f276-4bed-3fa6-00a21b81ca61@suse.de> Date: Fri, 02 Aug 2019 15:14:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.8.0 MIME-Version: 1.0 In-Reply-To: <20190517201814.27951-1-tromey@adacore.com> Content-Type: multipart/mixed; boundary="------------DD318BE82FF581F001A1EA86" X-IsSubscribed: yes X-SW-Source: 2019-08/txt/msg00047.txt.bz2 This is a multi-part message in MIME format. --------------DD318BE82FF581F001A1EA86 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Content-length: 1295 On 17-05-19 22:18, Tom Tromey wrote: > From: Tom Tromey > > PR c++/20020 concerns a crash in cp_print_value_fields. The immediate > cause is that cp_print_value_fields does not handle the case where > value_static_field fails. This is fixed in this patch by calling > cp_print_static_field from the "try" block. > > Digging a bit deeper, the error occurs because GCC does not emit a > DW_AT_const_value for a static constexpr member appearing in a > template class. I've filed a GCC bug for this. > > Tested on x86-64 Fedora 29. > > gdb/ChangeLog > 2019-05-17 Tom Tromey > > PR c++/20020: > * cp-valprint.c (cp_print_value_fields): Call > cp_print_static_field inside "try". > > gdb/testsuite/ChangeLog > 2019-05-17 Tom Tromey > > PR c++/20020: > * gdb.cp/constexpr-field.exp: New file. > * gdb.cp/constexpr-field.cc: New file. OK to backport to 8.3, as well as the followup patch "Fix two buglets in cp_print_value_fields patch"? Neither of the patches apply cleanly, so I'm attaching them here. The difference in test results is: ... +Running gdb/testsuite/gdb.cp/constexpr-field.exp ... +XFAIL: gdb.cp/constexpr-field.exp: print x (PRMS gcc/90526) +PASS: gdb.cp/constexpr-field.exp: print y ... Thanks, - Tom --------------DD318BE82FF581F001A1EA86 Content-Type: text/x-patch; name="0001-Fix-crash-in-cp_print_value_fields.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0001-Fix-crash-in-cp_print_value_fields.patch" Content-length: 5553 Fix crash in cp_print_value_fields [ Backport of master commit 4330d61dfb. ] PR c++/20020 concerns a crash in cp_print_value_fields. The immediate cause is that cp_print_value_fields does not handle the case where value_static_field fails. This is fixed in this patch by calling cp_print_static_field from the "try" block. Digging a bit deeper, the error occurs because GCC does not emit a DW_AT_const_value for a static constexpr member appearing in a template class. I've filed a GCC bug for this. Tested on x86-64 Fedora 29. gdb/ChangeLog 2019-05-29 Tom Tromey PR c++/20020: * cp-valprint.c (cp_print_value_fields): Call cp_print_static_field inside "try". gdb/testsuite/ChangeLog 2019-05-29 Tom Tromey PR c++/20020: * gdb.cp/constexpr-field.exp: New file. * gdb.cp/constexpr-field.cc: New file. --- gdb/ChangeLog | 6 ++++++ gdb/cp-valprint.c | 13 +++++------ gdb/testsuite/ChangeLog | 6 ++++++ gdb/testsuite/gdb.cp/constexpr-field.cc | 37 ++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/constexpr-field.exp | 36 +++++++++++++++++++++++++++++++ 5 files changed, 90 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee958c3f6e..f15cc5fcf0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,9 @@ +2019-05-29 Tom Tromey + + PR c++/20020: + * cp-valprint.c (cp_print_value_fields): Call + cp_print_static_field inside "try". + 2019-06-10 Tom de Vries PR symtab/24545 diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 7124da42ec..8feaae03aa 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -314,13 +314,14 @@ cp_print_value_fields (struct type *type, struct type *real_type, } else if (field_is_static (&TYPE_FIELD (type, i))) { - struct value *v = NULL; - TRY { - v = value_static_field (type, i); - } + struct value *v = value_static_field (type, i); + cp_print_static_field (TYPE_FIELD_TYPE (type, i), + v, stream, recurse + 1, + options); + } CATCH (ex, RETURN_MASK_ERROR) { fprintf_filtered (stream, @@ -328,10 +329,6 @@ cp_print_value_fields (struct type *type, struct type *real_type, ex.message); } END_CATCH - - cp_print_static_field (TYPE_FIELD_TYPE (type, i), - v, stream, recurse + 1, - options); } else if (i == vptr_fieldno && type == vptr_basetype) { diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ea1f78cc4b..5f26daa67e 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-05-29 Tom Tromey + + PR c++/20020: + * gdb.cp/constexpr-field.exp: New file. + * gdb.cp/constexpr-field.cc: New file. + 2019-04-30 Tom Tromey PR c++/24470: diff --git a/gdb/testsuite/gdb.cp/constexpr-field.cc b/gdb/testsuite/gdb.cp/constexpr-field.cc new file mode 100644 index 0000000000..ac2e514cb3 --- /dev/null +++ b/gdb/testsuite/gdb.cp/constexpr-field.cc @@ -0,0 +1,37 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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 . */ + +template +struct X +{ + static constexpr bool f = true; +}; + +X x; + +struct Y +{ + static constexpr bool f = true; +}; + +Y y; + +int +main (void) +{ + return 0; +} diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp new file mode 100644 index 0000000000..e4849efeae --- /dev/null +++ b/gdb/testsuite/gdb.cp/constexpr-field.exp @@ -0,0 +1,36 @@ +# 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 . + +# This file is part of the gdb testsuite. + +if {[skip_cplus_tests]} { continue } + +standard_testfile .cc + +if {[prepare_for_testing "failed to prepare" $testfile $srcfile \ + {c++ debug additional_flags=-std=c++17}]} { + return -1 +} + +if {![runto_main]} { + perror "couldn't run to breakpoint" + continue +} + +# "x" sometimes isn't available due to +# https://gcc.gnu.org/bugzilla/show_bug.cgi?id=90526 +gdb_test "print x" " = {static f = .*}" + +gdb_test "print y" " = {static f = true}" --------------DD318BE82FF581F001A1EA86 Content-Type: text/x-patch; name="0002-Fix-buglet-in-cp_print_value_fields-patch.patch" Content-Transfer-Encoding: 7bit Content-Disposition: inline; filename="0002-Fix-buglet-in-cp_print_value_fields-patch.patch" Content-length: 1374 Fix buglet in cp_print_value_fields patch [ Backport of master commit 3d507ff23b. ] Pedro pointed out an issue in the cp_print_value_fields patch, aka the fix for PR c++/20020. This patch addresses the issue. Tested on x86-64 Fedora 29. gdb/testsuite/ChangeLog 2019-06-27 Tom Tromey * gdb.cp/constexpr-field.exp: Use setup_xfail. --- gdb/testsuite/ChangeLog | 4 ++++ gdb/testsuite/gdb.cp/constexpr-field.exp | 3 ++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 5f26daa67e..c51036165c 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-05-29 Tom Tromey PR c++/20020: diff --git a/gdb/testsuite/gdb.cp/constexpr-field.exp b/gdb/testsuite/gdb.cp/constexpr-field.exp index e4849efeae..2f71cef952 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}" --------------DD318BE82FF581F001A1EA86--