Return unique_xmalloc_ptr for generate_c_for_variable_locations

[deliverable/binutils-gdb.git] / gdb / compile / compile-object-run.c

diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c
index e8527b02b4ecae8ea3860e918f9a4748bd97e669..e8a95e3cfe8783029e8e7d2c42d6c98cf1ff9652 100644 (file)
--- a/gdb/compile/compile-object-run.c
+++ b/gdb/compile/compile-object-run.c
@@ -1,6 +1,6 @@
 /* Call module for 'compile' command.
 
-   Copyright (C) 2014-2016 Free Software Foundation, Inc.
+   Copyright (C) 2014-2018 Free Software Foundation, Inc.
 
    This file is part of GDB.
 
@@ -87,7 +87,7 @@ do_module_cleanup (void *arg, int registers_valid)
     if ((objfile->flags & OBJF_USERLOADED) == 0
         && (strcmp (objfile_name (objfile), data->objfile_name_string) == 0))
       {
-       free_objfile (objfile);
+       delete objfile;
 
        /* It may be a bit too pervasive in this dummy_frame dtor callback.  */
        clear_symtab_users (0);
@@ -116,8 +116,6 @@ void
 compile_object_run (struct compile_module *module)
 {
   struct value *func_val;
-  struct frame_id dummy_id;
-  struct cleanup *cleanups;
   struct do_module_cleanup *data;
   const char *objfile_name_s = objfile_name (module->objfile);
   int dtor_found, executed = 0;
@@ -172,7 +170,8 @@ compile_object_run (struct compile_module *module)
          ++current_arg;
        }
       gdb_assert (current_arg == TYPE_NFIELDS (func_type));
-      call_function_by_hand_dummy (func_val, TYPE_NFIELDS (func_type), vargs,
+      call_function_by_hand_dummy (func_val,
+                                  NULL, TYPE_NFIELDS (func_type), vargs,
                                   do_module_cleanup, data);
     }
   CATCH (ex, RETURN_MASK_ERROR)