From 1f704f761b34e145f5eabdc222301ce6e9ec9102 Mon Sep 17 00:00:00 2001 From: Simon Marchi Date: Fri, 22 May 2020 16:55:15 -0400 Subject: gdb: remove TYPE_NFIELDS macro Remove `TYPE_NFIELDS`, changing all the call sites to use `type::num_fields` directly. This is quite a big diff, but this was mostly done using sed and coccinelle. A few call sites were done by hand. gdb/ChangeLog: * gdbtypes.h (TYPE_NFIELDS): Remove. Change all cal sites to use type::num_fields instead. Change-Id: Ib73be4c36f9e770e0f729bac3b5257d7cb2f9591 --- gdb/compile/compile-object-run.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/compile/compile-object-run.c') diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c index cef1d06..d8e2853 100644 --- a/gdb/compile/compile-object-run.c +++ b/gdb/compile/compile-object-run.c @@ -153,23 +153,23 @@ compile_object_run (struct compile_module *module) func_val = value_from_pointer (lookup_pointer_type (func_type), BLOCK_ENTRY_PC (SYMBOL_BLOCK_VALUE (func_sym))); - vargs = XALLOCAVEC (struct value *, TYPE_NFIELDS (func_type)); - if (TYPE_NFIELDS (func_type) >= 1) + vargs = XALLOCAVEC (struct value *, func_type->num_fields ()); + if (func_type->num_fields () >= 1) { gdb_assert (regs_addr != 0); vargs[current_arg] = value_from_pointer (TYPE_FIELD_TYPE (func_type, current_arg), regs_addr); ++current_arg; } - if (TYPE_NFIELDS (func_type) >= 2) + if (func_type->num_fields () >= 2) { gdb_assert (data->out_value_addr != 0); vargs[current_arg] = value_from_pointer (TYPE_FIELD_TYPE (func_type, current_arg), data->out_value_addr); ++current_arg; } - gdb_assert (current_arg == TYPE_NFIELDS (func_type)); - auto args = gdb::make_array_view (vargs, TYPE_NFIELDS (func_type)); + gdb_assert (current_arg == func_type->num_fields ()); + auto args = gdb::make_array_view (vargs, func_type->num_fields ()); call_function_by_hand_dummy (func_val, NULL, args, do_module_cleanup, data); } -- cgit v1.1