From 4330d61dfb05d77fd925efdca45091f12e3a6266 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 29 May 2019 09:34:50 -0600 Subject: Fix crash in cp_print_value_fields 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/cp-valprint.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) (limited to 'gdb/cp-valprint.c') diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index ff860df..d8d5c06 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) { -- cgit v1.1