summaryrefslogtreecommitdiff
path: root/gdb/cp-valprint.c
diff options
context:
space:
mode:
authorTom Tromey <tromey@adacore.com>2019-05-29 09:34:50 -0600
committerTom Tromey <tromey@adacore.com>2019-05-29 09:44:09 -0600
commit4330d61dfb05d77fd925efdca45091f12e3a6266 (patch)
treedf204aed8586f17ce5b39768483887a843ce036a /gdb/cp-valprint.c
parent6ff185b89017b16e9092142515f0a119b684ac72 (diff)
downloadbinutils-gdb-4330d61dfb05d77fd925efdca45091f12e3a6266.tar.gz
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 <tromey@adacore.com> 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 <tromey@adacore.com> PR c++/20020: * gdb.cp/constexpr-field.exp: New file. * gdb.cp/constexpr-field.cc: New file.
Diffstat (limited to 'gdb/cp-valprint.c')
-rw-r--r--gdb/cp-valprint.c12
1 files changed, 5 insertions, 7 deletions
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,
_("<error reading variable: %s>"),
ex.what ());
}
-
- cp_print_static_field (TYPE_FIELD_TYPE (type, i),
- v, stream, recurse + 1, opts);
}
else if (i == vptr_fieldno && type == vptr_basetype)
{