diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/cp-valprint.c | 16 |
2 files changed, 18 insertions, 3 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0e8a04f..5165b86 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,10 @@ 2011-05-17 Tom Tromey <tromey@redhat.com> + * cp-valprint.c (cp_print_value_fields): Catch errors from + value_static_field. + +2011-05-17 Tom Tromey <tromey@redhat.com> + * dwarf2read.c (dwarf2_get_die_type): Call get_die_type_at_offset. * dwarf2expr.c (dwarf_get_base_type): Handle NULL return from diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 255e9ce..f8516d5 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -340,9 +340,19 @@ cp_print_value_fields (struct type *type, struct type *real_type, } else if (field_is_static (&TYPE_FIELD (type, i))) { - struct value *v = value_static_field (type, i); - - if (v == NULL) + volatile struct gdb_exception ex; + struct value *v = NULL; + + TRY_CATCH (ex, RETURN_MASK_ERROR) + { + v = value_static_field (type, i); + } + + if (ex.reason < 0) + fprintf_filtered (stream, + _("<error reading variable: %s>"), + ex.message); + else if (v == NULL) val_print_optimized_out (stream); else cp_print_static_field (TYPE_FIELD_TYPE (type, i), |