From patchwork Fri May 17 20:18:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 32750 Received: (qmail 9991 invoked by alias); 17 May 2019 20:18:24 -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 9983 invoked by uid 89); 17 May 2019 20:18:24 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.7 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=ham version=3.3.1 spammy=deeper X-HELO: rock.gnat.com Received: from rock.gnat.com (HELO rock.gnat.com) (205.232.38.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 17 May 2019 20:18:20 +0000 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id DA23556001; Fri, 17 May 2019 16:18:18 -0400 (EDT) Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id ZdeQ5kUNz+Z1; Fri, 17 May 2019 16:18:18 -0400 (EDT) Received: from murgatroyd.Home (71-218-69-43.hlrn.qwest.net [71.218.69.43]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPSA id 4B01256005; Fri, 17 May 2019 16:18:17 -0400 (EDT) From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH] Fix crash in cp_print_value_fields Date: Fri, 17 May 2019 14:18:14 -0600 Message-Id: <20190517201814.27951-1-tromey@adacore.com> MIME-Version: 1.0 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. --- gdb/ChangeLog | 6 ++++ gdb/cp-valprint.c | 12 ++++---- 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(+), 7 deletions(-) create mode 100644 gdb/testsuite/gdb.cp/constexpr-field.cc create mode 100644 gdb/testsuite/gdb.cp/constexpr-field.exp diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index ff860df499a..d8d5c06fd1e 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -329,22 +329,20 @@ 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 (const gdb_exception_error &ex) { fprintf_filtered (stream, _(""), ex.what ()); } - - cp_print_static_field (TYPE_FIELD_TYPE (type, i), - v, stream, recurse + 1, opts); } else if (i == vptr_fieldno && type == vptr_basetype) { diff --git a/gdb/testsuite/gdb.cp/constexpr-field.cc b/gdb/testsuite/gdb.cp/constexpr-field.cc new file mode 100644 index 00000000000..ac2e514cb38 --- /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 00000000000..e4849efeae9 --- /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}"