Toolchain/binutils-gdb
1
0
Fork 0
forked from Imagelibrary/binutils-gdb
Code Pull Requests Activity

Use new/delete for do_module_cleanup

Browse Source 
This changes do_module_cleanup to use new and delete.  It also removes
the use of the struct hack from this object -- this requires more
allocations for now, but this will be removed in a subsequent patch.

gdb/ChangeLog
2020-09-23  Tom Tromey  <tom@tromey.com>

	* compile/compile-object-run.c (struct do_module_cleanup): Add
	constructor, destructor.
	<objfile_name_string>: Don't use struct hack.
	(do_module_cleanup): Use delete.
	(compile_object_run): Use new.
This commit is contained in:
Tom Tromey
2020-09-23 09:32:54 -06:00
parent ebe824f5dc
commit 0dbf6ee6a0
2 changed files with 26 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@@ -1,3 +1,11 @@
2020-09-23 Tom Tromey <tom@tromey.com>
* compile/compile-object-run.c (struct do_module_cleanup): Add
constructor, destructor.
<objfile_name_string>: Don't use struct hack.
(do_module_cleanup): Use delete.
(compile_object_run): Use new.
2020-09-23 Tom Tromey <tom@tromey.com> 2020-09-23 Tom Tromey <tom@tromey.com>
* compile/compile-cplus-types.c * compile/compile-cplus-types.c

28
gdb/compile/compile-object-run.c
View File

@@ -32,12 +32,23 @@
struct do_module_cleanup struct do_module_cleanup
{ {
do_module_cleanup () = default;
~do_module_cleanup ()
{
delete munmap_list_head;
xfree (source_file);
xfree (objfile_name_string);
}
DISABLE_COPY_AND_ASSIGN (do_module_cleanup);
/* Boolean to set true upon a call of do_module_cleanup. /* Boolean to set true upon a call of do_module_cleanup.
The pointer may be NULL. */ The pointer may be NULL. */
int *executedp; int *executedp;
/* .c file OBJFILE was built from. It needs to be xfree-d. */ /* .c file OBJFILE was built from. It needs to be xfree-d. */
char *source_file; char *source_file = nullptr;
/* Copy from struct compile_module. */ /* Copy from struct compile_module. */
enum compile_i_scope_types scope; enum compile_i_scope_types scope;
@@ -48,10 +59,10 @@ struct do_module_cleanup
CORE_ADDR out_value_addr; CORE_ADDR out_value_addr;
/* Copy from struct compile_module. */ /* Copy from struct compile_module. */
struct munmap_list *munmap_list_head; struct munmap_list *munmap_list_head = nullptr;
/* objfile_name of our objfile. */ /* objfile_name of our objfile. */
char objfile_name_string[1]; char *objfile_name_string = nullptr;
}; };
/* Cleanup everything after the inferior function dummy frame gets /* Cleanup everything after the inferior function dummy frame gets
@@ -96,13 +107,11 @@ do_module_cleanup (void *arg, int registers_valid)
/* Delete the .c file. */ /* Delete the .c file. */
unlink (data->source_file); unlink (data->source_file);
xfree (data->source_file);
delete data->munmap_list_head;
/* Delete the .o file. */ /* Delete the .o file. */
unlink (data->objfile_name_string); unlink (data->objfile_name_string);
xfree (data);
delete data;
} }
/* Create a copy of FUNC_TYPE that is independent of OBJFILE. */ /* Create a copy of FUNC_TYPE that is independent of OBJFILE. */
@@ -132,11 +141,10 @@ compile_object_run (struct compile_module *module)
CORE_ADDR regs_addr = module->regs_addr; CORE_ADDR regs_addr = module->regs_addr;
struct objfile *objfile = module->objfile; struct objfile *objfile = module->objfile;
data = (struct do_module_cleanup *) xmalloc (sizeof (*data) data = new struct do_module_cleanup;
+ strlen (objfile_name_s));
data->executedp = &executed; data->executedp = &executed;
data->source_file = xstrdup (module->source_file); data->source_file = xstrdup (module->source_file);
strcpy (data->objfile_name_string, objfile_name_s); data->objfile_name_string = xstrdup (objfile_name_s);
data->scope = module->scope; data->scope = module->scope;
data->scope_data = module->scope_data; data->scope_data = module->scope_data;
data->out_value_type = module->out_value_type; data->out_value_type = module->out_value_type;