From: Tom Tromey <tom@tromey.com>
Date: Sat, 20 Mar 2021 23:23:40 +0000 (-0600)
Subject: Rearrange psymtab_storage construction
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b29b98cf8411ac136d17fc68236fc029447f1461;p=binutils-gdb.git

Rearrange psymtab_storage construction

This changes objfile so that it doesn't construct a psymtab_storage
object until the psymtab functions are installed.  It also applies a
similar treatment to reread_symbols.

gdb/ChangeLog
2021-03-20  Tom Tromey  <tom@tromey.com>

	* symfile.c (syms_from_objfile_1): Call reset_psymtabs.
	(reread_symbols): Move reset_psymtabs call later.
	* objfiles.c (objfile::objfile): Don't initialize
	partial_symtabs.
---

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index abeaad8f613..9eba43c12e5 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-20  Tom Tromey  <tom@tromey.com>
+
+	* symfile.c (syms_from_objfile_1): Call reset_psymtabs.
+	(reread_symbols): Move reset_psymtabs call later.
+	* objfiles.c (objfile::objfile): Don't initialize
+	partial_symtabs.
+
 2021-03-20  Tom Tromey  <tom@tromey.com>
 
 	* dwarf2/read.c (dwarf2_build_psymtabs): Call
diff --git a/gdb/objfiles.c b/gdb/objfiles.c
index bfa5f0443e3..ca135dd63c3 100644
--- a/gdb/objfiles.c
+++ b/gdb/objfiles.c
@@ -323,7 +323,6 @@ build_objfile_section_table (struct objfile *objfile)
 objfile::objfile (bfd *abfd, const char *name, objfile_flags flags_)
   : flags (flags_),
     pspace (current_program_space),
-    partial_symtabs (new psymtab_storage ()),
     obfd (abfd)
 {
   const char *expanded_name;
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 12746c43374..01304523c0d 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -904,6 +904,7 @@ syms_from_objfile_1 (struct objfile *objfile,
   const int mainline = add_flags & SYMFILE_MAINLINE;
 
   objfile_set_sym_fns (objfile, find_sym_fns (objfile->obfd));
+  objfile->reset_psymtabs ();
   objfile->qf = make_psymbol_functions (objfile->partial_symtabs);
 
   if (objfile->sf == NULL)
@@ -2522,8 +2523,6 @@ reread_symbols (void)
 	    error (_("Can't read symbols from %s: %s."), objfile_name (objfile),
 		   bfd_errmsg (bfd_get_error ()));
 
-	  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);
@@ -2555,6 +2554,7 @@ reread_symbols (void)
 	     based on whether .gdb_index is present, and we need it to
 	     start over.  PR symtab/15885  */
 	  objfile_set_sym_fns (objfile, find_sym_fns (objfile->obfd));
+	  objfile->reset_psymtabs ();
 	  objfile->qf = make_psymbol_functions (objfile->partial_symtabs);
 
 	  build_objfile_section_table (objfile);