diff options
Diffstat (limited to 'gdb/p-valprint.c')
| -rw-r--r-- | gdb/p-valprint.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/gdb/p-valprint.c b/gdb/p-valprint.c index 064e819..3b1303d 100644 --- a/gdb/p-valprint.c +++ b/gdb/p-valprint.c @@ -305,12 +305,10 @@ pascal_value_print_inner (struct value *val, struct ui_file *stream, /* Extract the address, assume that it is unsigned. */ print_address_demangle (options, gdbarch, - extract_unsigned_integer (valaddr - + TYPE_FIELD_BITPOS (type, - VTBL_FNADDR_OFFSET) / 8, - TYPE_LENGTH (TYPE_FIELD_TYPE (type, - VTBL_FNADDR_OFFSET)), - byte_order), + extract_unsigned_integer + (valaddr + TYPE_FIELD_BITPOS (type, VTBL_FNADDR_OFFSET) / 8, + TYPE_LENGTH (type->field (VTBL_FNADDR_OFFSET).type ()), + byte_order), stream, demangle); } else @@ -580,7 +578,7 @@ pascal_object_print_value_fields (struct value *val, struct ui_file *stream, wrap_here (n_spaces (2 + 2 * recurse)); } - annotate_field_begin (TYPE_FIELD_TYPE (type, i)); + annotate_field_begin (type->field (i).type ()); if (field_is_static (&type->field (i))) { |