From 940da03e32c28144134d0373faf7fd5ea158f1ae Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 8 Jun 2020 15:26:20 -0400 Subject: 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 --- gdb/p-lang.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gdb/p-lang.c') diff --git a/gdb/p-lang.c b/gdb/p-lang.c index 777f1ff..f3d10d0 100644 --- a/gdb/p-lang.c +++ b/gdb/p-lang.c @@ -113,11 +113,11 @@ is_pascal_string_type (struct type *type,int *length_pos, if (length_pos) *length_pos = TYPE_FIELD_BITPOS (type, 0) / TARGET_CHAR_BIT; if (length_size) - *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 0)); + *length_size = TYPE_LENGTH (type->field (0).type ()); if (string_pos) *string_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT; if (char_type) - *char_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 1)); + *char_type = TYPE_TARGET_TYPE (type->field (1).type ()); if (arrayname) *arrayname = TYPE_FIELD_NAME (type, 1); return 2; @@ -133,13 +133,13 @@ is_pascal_string_type (struct type *type,int *length_pos, if (length_pos) *length_pos = TYPE_FIELD_BITPOS (type, 1) / TARGET_CHAR_BIT; if (length_size) - *length_size = TYPE_LENGTH (TYPE_FIELD_TYPE (type, 1)); + *length_size = TYPE_LENGTH (type->field (1).type ()); if (string_pos) *string_pos = TYPE_FIELD_BITPOS (type, 2) / TARGET_CHAR_BIT; /* FIXME: how can I detect wide chars in GPC ?? */ if (char_type) { - *char_type = TYPE_TARGET_TYPE (TYPE_FIELD_TYPE (type, 2)); + *char_type = TYPE_TARGET_TYPE (type->field (2).type ()); if ((*char_type)->code () == TYPE_CODE_ARRAY) *char_type = TYPE_TARGET_TYPE (*char_type); -- cgit v1.1