[PATCH 4/4] gdb: remove objfile parameter from get_objfile_bfd_data
Simon Marchi
simon.marchi@efficios.com
Mon Mar 22 19:34:17 GMT 2021
From: Simon Marchi <simon.marchi@polymtl.ca>
I noticed it was unused. I think that makes sense, as it shows that
objfile_per_bfd_storage is not specific to one objfile (it can be shared
by multiple objfiles that have the same bfd).
There is one thing I wonder though, maybe I'm missing something. If
the BFD doesn't require relocation, get_objfile_bfd_data stores the
newly allocated object in objfiles_bfd_data, so we can assume that
objfiles_bfd_data is the owner of the object. When the bfd's refcount
drops to 0, the corresponding objfile_per_bfd_storage object in
objfiles_bfd_data is deleted.
But if the BFD requires relocation, get_objfile_bfd_data returns a newly
allocated object that isn't kept anywhere else (and isn't shared). So
the objfile becomes the owner of the objfile_per_bfd_storage object. In
objfile::~objfile, we have this:
if (obfd)
gdb_bfd_unref (obfd);
else
delete per_bfd;
I'm thinking that obfd could be non-nullptr, and it could require
relocation. In that case, it would never be freed. Anyway, that's not
really connected to this patch.
gdb/ChangeLog:
* objfiles.c (get_objfile_bfd_data): Remove objfile parameter,
adjust callers.
Change-Id: Ifa3158074ea6b42686780ba09d0c964b0cf14cf1
---
gdb/objfiles.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index 702900761f3..f68e97bd08f 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -125,7 +125,7 @@ objfile_per_bfd_storage::~objfile_per_bfd_storage ()
only be called when allocating or re-initializing OBJFILE. */
static struct objfile_per_bfd_storage *
-get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
+get_objfile_bfd_data (bfd *abfd)
{
struct objfile_per_bfd_storage *storage = NULL;
@@ -154,7 +154,7 @@ get_objfile_bfd_data (struct objfile *objfile, struct bfd *abfd)
void
set_objfile_per_bfd (struct objfile *objfile)
{
- objfile->per_bfd = get_objfile_bfd_data (objfile, objfile->obfd);
+ objfile->per_bfd = get_objfile_bfd_data (objfile->obfd);
}
/* Set the objfile's per-BFD notion of the "main" name and
@@ -363,7 +363,7 @@ objfile::objfile (bfd *abfd, const char *name, objfile_flags flags_)
build_objfile_section_table (this);
}
- per_bfd = get_objfile_bfd_data (this, abfd);
+ per_bfd = get_objfile_bfd_data (abfd);
}
/* If there is a valid and known entry point, function fills *ENTRY_P with it
--
2.30.0
More information about the Gdb-patches
mailing list