[binutils-gdb] gdb, compile: unlink objfile stored in module

[binutils-gdb] gdb, compile: unlink objfile stored in module

[Markus Metzger]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=fb4f3f38e98599690946cc24b09ae6883a36edb0

commit fb4f3f38e98599690946cc24b09ae6883a36edb0
Author: Markus Metzger <markus.t.metzger@intel.com>
Date:   Mon Apr 11 15:12:33 2022 +0200

    gdb, compile: unlink objfile stored in module
    
    When cleaning up after a compile command, we iterate over all objfiles and
    unlink the first objfile with the same name as the one we compiled.
    
    Since we already store a pointer to that objfile in the module and use it
    to get the name we're comparing against, there's no reason to iterate, at
    all.  We can simply use that objfile.
    
    This further avoids potential issues when an objfile with the same name is
    loaded into a different linker namespace.

Diff:
---
 gdb/compile/compile-object-run.c | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/gdb/compile/compile-object-run.c b/gdb/compile/compile-object-run.c
index 6fcd10b29a4..af761e8782c 100644
--- a/gdb/compile/compile-object-run.c
+++ b/gdb/compile/compile-object-run.c
@@ -79,21 +79,18 @@ do_module_cleanup (void *arg, int registers_valid)
 	}
     }
 
+  objfile *objfile = data->module->objfile;
+  gdb_assert (objfile != nullptr);
+
   /* We have to make a copy of the name so that we can unlink the
      underlying file -- removing the objfile will cause the name to be
      freed, so we can't simply keep a reference to it.  */
-  std::string objfile_name_s = objfile_name (data->module->objfile);
-  for (objfile *objfile : current_program_space->objfiles ())
-    if ((objfile->flags & OBJF_USERLOADED) == 0
-	&& objfile_name_s == objfile_name (objfile))
-      {
-	objfile->unlink ();
-
-	/* It may be a bit too pervasive in this dummy_frame dtor callback.  */
-	clear_symtab_users (0);
-
-	break;
-      }
+  std::string objfile_name_s = objfile_name (objfile);
+
+  objfile->unlink ();
+
+  /* It may be a bit too pervasive in this dummy_frame dtor callback.  */
+  clear_symtab_users (0);
 
   /* Delete the .c file.  */
   unlink (data->module->source_file.c_str ());