This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH v2 07/12] Introduce objfile::reset_psymtabs
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Sun, 25 Nov 2018 12:20:38 -0700
- Subject: [PATCH v2 07/12] Introduce objfile::reset_psymtabs
- References: <20181125192043.8405-1-tom@tromey.com>
This introduces a new method, objfile::reset_psymtabs, and changes
reread_symbols to use it. This method simply destroys the existing
partial symbols and recreates the psymtab_storage object.
This patch fixes a latent bug -- namely, that reread_symbols should
clear objfile::psymbol_map, but does not. I can submit that
separately if you'd prefer.
gdb/ChangeLog
2018-11-25 Tom Tromey <tom@tromey.com>
* symfile.c (reread_symbols): Call objfile->reset_psymtabs.
* objfiles.h (objfile::reset_psymtabs): New method.
---
gdb/ChangeLog | 5 +++++
gdb/objfiles.h | 9 +++++++++
gdb/symfile.c | 12 +-----------
3 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/gdb/objfiles.h b/gdb/objfiles.h
index a3ec3884cf..7b132db395 100644
--- a/gdb/objfiles.h
+++ b/gdb/objfiles.h
@@ -291,6 +291,15 @@ struct objfile
DISABLE_COPY_AND_ASSIGN (objfile);
+ /* Reset the storage for the partial symbol tables. */
+
+ void reset_psymtabs ()
+ {
+ psymbol_map.clear ();
+ partial_symtabs.reset (new psymtab_storage (this));
+ }
+
+
/* All struct objfile's are chained together by their next pointers.
The program space field "objfiles" (frequently referenced via
the macro "object_files") points to the first link in this chain. */
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 64fbfb43db..f2d29066b5 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -2479,23 +2479,13 @@ reread_symbols (void)
memcpy (offsets, objfile->section_offsets,
SIZEOF_N_SECTION_OFFSETS (num_offsets));
- /* FIXME: Do we have to free a whole linked list, or is this
- enough? */
- objfile->partial_symtabs->global_psymbols.clear ();
- objfile->partial_symtabs->static_psymbols.clear ();
-
- /* Free the obstacks for non-reusable objfiles. */
- psymbol_bcache_free (objfile->partial_symtabs->psymbol_cache);
- objfile->partial_symtabs->psymbol_cache = psymbol_bcache_init ();
+ objfile->reset_psymtabs ();
/* NB: after this call to obstack_free, objfiles_changed
will need to be called (see discussion below). */
obstack_free (&objfile->objfile_obstack, 0);
objfile->sections = NULL;
objfile->compunit_symtabs = NULL;
- objfile->partial_symtabs->psymtabs = NULL;
- objfile->partial_symtabs->psymtabs_addrmap = NULL;
- objfile->partial_symtabs->free_psymtabs = NULL;
objfile->template_symbols = NULL;
objfile->static_links = NULL;
--
2.17.2