diff options
| author | Simon Marchi <simon.marchi@efficios.com> | 2020-06-08 15:26:20 -0400 |
|---|---|---|
| committer | Simon Marchi <simon.marchi@efficios.com> | 2020-06-08 15:26:31 -0400 |
| commit | 940da03e32c28144134d0373faf7fd5ea158f1ae (patch) | |
| tree | a104a5666df69b0a45c5e5d04aba70cb10410dad /gdb/cp-valprint.c | |
| parent | b6cdac4b80c1d32726227305e16483cef9d40e2c (diff) | |
| download | binutils-gdb-940da03e32c28144134d0373faf7fd5ea158f1ae.tar.gz | |
gdb: remove TYPE_FIELD_TYPE macro
Remove the `TYPE_FIELD_TYPE` macro, changing all the call sites to use
`type::field` and `field::type` directly.
gdb/ChangeLog:
* gdbtypes.h (TYPE_FIELD_TYPE): Remove. Change all call sites
to use type::field and field::type instead.
Change-Id: Ifda6226a25c811cfd334a756a9fbc5c0afdddff3
Diffstat (limited to 'gdb/cp-valprint.c')
| -rw-r--r-- | gdb/cp-valprint.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 0c79b025bd3..a02fee6b552 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -223,7 +223,7 @@ cp_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))) { @@ -301,7 +301,7 @@ cp_print_value_fields (struct value *val, struct ui_file *stream, { struct value *v = value_static_field (type, i); - cp_print_static_field (TYPE_FIELD_TYPE (type, i), + cp_print_static_field (type->field (i).type (), v, stream, recurse + 1, opts); } @@ -315,7 +315,7 @@ cp_print_value_fields (struct value *val, struct ui_file *stream, else if (i == vptr_fieldno && type == vptr_basetype) { int i_offset = TYPE_FIELD_BITPOS (type, i) / 8; - struct type *i_type = TYPE_FIELD_TYPE (type, i); + struct type *i_type = type->field (i).type (); if (valprint_check_validity (stream, i_type, i_offset, val)) { @@ -655,11 +655,11 @@ cp_find_class_member (struct type **self_p, int *fieldno, for (i = 0; i < TYPE_N_BASECLASSES (self); i++) { LONGEST bitpos = TYPE_FIELD_BITPOS (self, i); - LONGEST bitsize = 8 * TYPE_LENGTH (TYPE_FIELD_TYPE (self, i)); + LONGEST bitsize = 8 * TYPE_LENGTH (self->field (i).type ()); if (offset >= bitpos && offset < bitpos + bitsize) { - *self_p = TYPE_FIELD_TYPE (self, i); + *self_p = self->field (i).type (); cp_find_class_member (self_p, fieldno, offset - bitpos); return; } |