From b6cdac4b80c1d32726227305e16483cef9d40e2c Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Mon, 8 Jun 2020 15:26:06 -0400 Subject: gdb: remove FIELD_TYPE macro Remove the `FIELD_TYPE` macro, changing all the call sites to use `field::type` directly. gdb/ChangeLog: * gdbtypes.h (FIELD_TYPE): Remove. Change all call sites to use field::type instead. Change-Id: I7673fedaa276e485189c87991a9043495da22ef5 --- gdb/gnu-v3-abi.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'gdb/gnu-v3-abi.c') diff --git a/gdb/gnu-v3-abi.c b/gdb/gnu-v3-abi.c index 8209d1b..8aa3e68 100644 --- a/gdb/gnu-v3-abi.c +++ b/gdb/gnu-v3-abi.c @@ -137,28 +137,28 @@ build_gdb_vtable_type (struct gdbarch *arch) FIELD_NAME (*field) = "vcall_and_vbase_offsets"; field->set_type (lookup_array_range_type (ptrdiff_type, 0, -1)); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; /* ptrdiff_t offset_to_top; */ FIELD_NAME (*field) = "offset_to_top"; field->set_type (ptrdiff_type); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; /* void *type_info; */ FIELD_NAME (*field) = "type_info"; field->set_type (void_ptr_type); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; /* void (*virtual_functions[0]) (); */ FIELD_NAME (*field) = "virtual_functions"; field->set_type (lookup_array_range_type (ptr_to_void_fn_type, 0, -1)); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; /* We assumed in the allocation above that there were four fields. */ @@ -1041,14 +1041,14 @@ build_std_type_info_type (struct gdbarch *arch) FIELD_NAME (*field) = "_vptr.type_info"; field->set_type (void_ptr_type); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; /* The name. */ FIELD_NAME (*field) = "__name"; field->set_type (char_ptr_type); SET_FIELD_BITPOS (*field, offset * TARGET_CHAR_BIT); - offset += TYPE_LENGTH (FIELD_TYPE (*field)); + offset += TYPE_LENGTH (field->type ()); field++; gdb_assert (field == (field_list + 2)); -- cgit v1.1