Introduce objfile::reset_psymtabs

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
2019-01-10  Tom Tromey  <tom@tromey.com>

	* symfile.c (reread_symbols): Call objfile->reset_psymtabs.
	* objfiles.h (objfile::reset_psymtabs): New method.
This commit is contained in:
Tom Tromey 2018-05-10 16:23:52 -06:00
parent d320c2b5e1
commit 6d6a12bf87
3 changed files with 15 additions and 11 deletions

View File

@ -1,3 +1,8 @@
2019-01-10 Tom Tromey <tom@tromey.com>
* symfile.c (reread_symbols): Call objfile->reset_psymtabs.
* objfiles.h (objfile::reset_psymtabs): New method.
2019-01-10 Tom Tromey <tom@tromey.com> 2019-01-10 Tom Tromey <tom@tromey.com>
* symmisc.c (print_symbol_bcache_statistics): Update. * symmisc.c (print_symbol_bcache_statistics): Update.

View File

@ -293,6 +293,15 @@ struct objfile
DISABLE_COPY_AND_ASSIGN (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. /* All struct objfile's are chained together by their next pointers.
The program space field "objfiles" (frequently referenced via The program space field "objfiles" (frequently referenced via
the macro "object_files") points to the first link in this chain. */ the macro "object_files") points to the first link in this chain. */

View File

@ -2524,23 +2524,13 @@ reread_symbols (void)
memcpy (offsets, objfile->section_offsets, memcpy (offsets, objfile->section_offsets,
SIZEOF_N_SECTION_OFFSETS (num_offsets)); SIZEOF_N_SECTION_OFFSETS (num_offsets));
/* FIXME: Do we have to free a whole linked list, or is this objfile->reset_psymtabs ();
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 ();
/* NB: after this call to obstack_free, objfiles_changed /* NB: after this call to obstack_free, objfiles_changed
will need to be called (see discussion below). */ will need to be called (see discussion below). */
obstack_free (&objfile->objfile_obstack, 0); obstack_free (&objfile->objfile_obstack, 0);
objfile->sections = NULL; objfile->sections = NULL;
objfile->compunit_symtabs = 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->template_symbols = NULL;
objfile->static_links = NULL; objfile->static_links = NULL;