[PATCH 2/6] Use new/delete for do_module_cleanup
Tom Tromey
tom@tromey.com
Sun Aug 9 13:52:54 GMT 2020
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-08-08 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.
---
gdb/ChangeLog | 8 ++++++++
gdb/compile/compile-object-run.c | 24 ++++++++++++++++--------
2 files changed, 24 insertions(+), 8 deletions(-)
diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c
index a2f39900053..4a18655d488 100644
--- a/gdb/compile/compile-object-run.c
+++ b/gdb/compile/compile-object-run.c
@@ -32,6 +32,17 @@
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.
The pointer may be NULL. */
int *executedp;
@@ -51,7 +62,7 @@ struct do_module_cleanup
struct munmap_list *munmap_list_head;
/* objfile_name of our objfile. */
- char objfile_name_string[1];
+ char *objfile_name_string;
};
/* 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. */
unlink (data->source_file);
- xfree (data->source_file);
-
- delete data->munmap_list_head;
/* Delete the .o file. */
unlink (data->objfile_name_string);
- xfree (data);
+
+ delete data;
}
/* Perform inferior call of MODULE. This function may throw an error.
@@ -122,11 +131,10 @@ compile_object_run (struct compile_module *module)
CORE_ADDR regs_addr = module->regs_addr;
struct objfile *objfile = module->objfile;
- data = (struct do_module_cleanup *) xmalloc (sizeof (*data)
- + strlen (objfile_name_s));
+ data = new struct do_module_cleanup;
data->executedp = &executed;
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_data = module->scope_data;
data->out_value_type = module->out_value_type;
--
2.17.2
More information about the Gdb-patches
mailing list