yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gdb, compile: unlink objfile stored in module

Browse Source 
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.
This commit is contained in:
Markus Metzger 2022-04-11 15:12:33 +02:00
parent 2733d9d5d6
commit fb4f3f38e9
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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 ();
std::string objfile_name_s = objfile_name (objfile);
/* It may be a bit too pervasive in this dummy_frame dtor callback. */
clear_symtab_users (0);
objfile->unlink ();
break;
}
/* 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 ());