/* Call module for 'compile' command.
- Copyright (C) 2014-2018 Free Software Foundation, Inc.
+ Copyright (C) 2014-2020 Free Software Foundation, Inc.
This file is part of GDB.
do_module_cleanup (void *arg, int registers_valid)
{
struct do_module_cleanup *data = (struct do_module_cleanup *) arg;
- struct objfile *objfile;
if (data->executedp != NULL)
{
addr_value = value_from_pointer (ptr_type, data->out_value_addr);
- /* SCOPE_DATA would be stale unlesse EXECUTEDP != NULL. */
+ /* SCOPE_DATA would be stale unless EXECUTEDP != NULL. */
compile_print_value (value_ind (addr_value), data->scope_data);
}
}
- ALL_OBJFILES (objfile)
+ for (objfile *objfile : current_program_space->objfiles ())
if ((objfile->flags & OBJF_USERLOADED) == 0
&& (strcmp (objfile_name (objfile), data->objfile_name_string) == 0))
{
- delete objfile;
+ objfile->unlink ();
/* It may be a bit too pervasive in this dummy_frame dtor callback. */
clear_symtab_users (0);
xfree (module);
module = NULL;
- TRY
+ try
{
struct type *func_type = SYMBOL_TYPE (func_sym);
htab_t copied_types;
func_type = copy_type_recursive (objfile, func_type, copied_types);
htab_delete (copied_types);
- gdb_assert (TYPE_CODE (func_type) == TYPE_CODE_FUNC);
+ gdb_assert (func_type->code () == TYPE_CODE_FUNC);
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);
}
- CATCH (ex, RETURN_MASK_ERROR)
+ catch (const gdb_exception_error &ex)
{
/* In the case of DTOR_FOUND or in the case of EXECUTED nothing
needs to be done. */
gdb_assert (!(dtor_found && executed));
if (!dtor_found && !executed)
do_module_cleanup (data, 0);
- throw_exception (ex);
+ throw;
}
- END_CATCH
dtor_found = find_dummy_frame_dtor (do_module_cleanup, data);
gdb_assert (!dtor_found && executed);