From 98c90f80283bbdf7df140041e3b784bfcb3b1d39 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 3 Aug 2019 09:42:28 +0200 Subject: [PATCH 1/1] 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(-) create mode 100644 gdb/testsuite/gdb.cp/constexpr-field.cc create mode 100644 gdb/testsuite/gdb.cp/constexpr-field.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index ee958c3..f15cc5f 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 7124da4..8feaae0 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 ea1f78c..5f26daa 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 0000000..ac2e514 --- /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 0000000..e4849ef --- /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}" -- 2.7.4