From b610c04548a39dbce6d51c33d7a8125e59066939 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Sun, 26 Sep 2021 16:36:15 -0400 Subject: gdb: remove TYPE_FIELD_BITPOS Remove TYPE_FIELD_BITPOS, replace its uses with type::field + field::loc_bitpos. Change-Id: Iccd8d5a77e5352843a837babaa6bd284162e0320 --- gdb/rust-lang.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gdb/rust-lang.c') diff --git a/gdb/rust-lang.c b/gdb/rust-lang.c index 1da758f..e5a4041 100644 --- a/gdb/rust-lang.c +++ b/gdb/rust-lang.c @@ -686,8 +686,8 @@ rust_print_struct_def (struct type *type, const char *varstring, std::sort (fields.begin (), fields.end (), [&] (int a, int b) { - return (TYPE_FIELD_BITPOS (type, a) - < TYPE_FIELD_BITPOS (type, b)); + return (type->field (a).loc_bitpos () + < type->field (b).loc_bitpos ()); }); for (int i : fields) @@ -943,7 +943,7 @@ rust_composite_type (struct type *original, if (i > 0) TYPE_LENGTH (result) - = (TYPE_FIELD_BITPOS (result, i - 1) / TARGET_CHAR_BIT + + = (result->field (i - 1).loc_bitpos () / TARGET_CHAR_BIT + TYPE_LENGTH (result->field (i - 1).type ())); return result; } -- cgit v1.1