[PATCH 2/4] Remove parameter from end_psymtab_common

Tom Tromey tom@tromey.com
Sat Oct 17 22:50:54 GMT 2020


The objfile parameter to end_psymtab_common is no longer needed, so
this removes it.

gdb/ChangeLog
2020-10-17  Tom Tromey  <tom@tromey.com>

	* dbxread.c (dbx_end_psymtab): Update.
	* dwarf2/read.c (process_psymtab_comp_unit_reader): Update.
	(build_type_psymtabs_reader): Update.
	* xcoffread.c (xcoff_end_psymtab): Update.
	* ctfread.c (scan_partial_symbols): Update.
	* psympriv.h (end_psymtab_common): Update.
	* psymtab.c (end_psymtab_common): Remove objfile parameter.
	(sort_pst_symbols): Likewise.
---
 gdb/ChangeLog     | 11 +++++++++++
 gdb/ctfread.c     |  2 +-
 gdb/dbxread.c     |  2 +-
 gdb/dwarf2/read.c |  5 ++---
 gdb/psympriv.h    |  2 +-
 gdb/psymtab.c     |  6 +++---
 gdb/xcoffread.c   |  2 +-
 7 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/gdb/ctfread.c b/gdb/ctfread.c
index 3c506dd42f8..b8d8434f6ca 100644
--- a/gdb/ctfread.c
+++ b/gdb/ctfread.c
@@ -1464,7 +1464,7 @@ scan_partial_symbols (ctf_file_t *cfp, struct objfile *of)
 			0, language_c, of);
     }
 
-  end_psymtab_common (of, pst);
+  end_psymtab_common (pst);
 }
 
 /* Read CTF debugging information from a BFD section.  This is
diff --git a/gdb/dbxread.c b/gdb/dbxread.c
index 4e189a7f127..f9ee00718db 100644
--- a/gdb/dbxread.c
+++ b/gdb/dbxread.c
@@ -2004,7 +2004,7 @@ dbx_end_psymtab (struct objfile *objfile, legacy_psymtab *pst,
 
   /* End of kludge for patching Solaris textlow and texthigh.  */
 
-  end_psymtab_common (objfile, pst);
+  end_psymtab_common (pst);
 
   pst->number_of_dependencies = number_dependencies;
   if (number_dependencies)
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index c5bfab19059..37e51ea45c5 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -7632,7 +7632,7 @@ process_psymtab_comp_unit_reader (const struct die_reader_specs *reader,
 						  best_highpc + baseaddr)
 		      - baseaddr);
 
-  end_psymtab_common (objfile, pst);
+  end_psymtab_common (pst);
 
   if (!cu->per_cu->imported_symtabs_empty ())
     {
@@ -7726,7 +7726,6 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader,
 			    struct die_info *type_unit_die)
 {
   dwarf2_per_objfile *per_objfile = reader->cu->per_objfile;
-  struct objfile *objfile = per_objfile->objfile;
   struct dwarf2_cu *cu = reader->cu;
   struct dwarf2_per_cu_data *per_cu = cu->per_cu;
   struct signatured_type *sig_type;
@@ -7759,7 +7758,7 @@ build_type_psymtabs_reader (const struct die_reader_specs *reader,
   highpc = (CORE_ADDR) 0;
   scan_partial_symbols (first_die, &lowpc, &highpc, 0, cu);
 
-  end_psymtab_common (objfile, pst);
+  end_psymtab_common (pst);
 }
 
 /* Struct used to sort TUs by their abbreviation table offset.  */
diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index 73077ebac7f..53dfb1b1cdf 100644
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -436,7 +436,7 @@ struct legacy_psymtab : public standard_psymtab
   void *read_symtab_private = nullptr;
 };
 
-extern void end_psymtab_common (struct objfile *, struct partial_symtab *);
+extern void end_psymtab_common (struct partial_symtab *);
 
 /* Used when recording partial symbol tables.  On destruction,
    discards any partial symbol tables that have been built.  However,
diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index 349c68ed55e..b3deef4107d 100644
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -1431,7 +1431,7 @@ const struct quick_symbol_functions psym_functions =
 
 
 static void
-sort_pst_symbols (struct objfile *objfile, struct partial_symtab *pst)
+sort_pst_symbols (struct partial_symtab *pst)
 {
   /* Sort the global list; don't sort the static list.  */
   std::sort (pst->global_psymbols.begin (),
@@ -1458,12 +1458,12 @@ partial_symtab::partial_symtab (const char *filename,
 /* Perform "finishing up" operations of a partial symtab.  */
 
 void
-end_psymtab_common (struct objfile *objfile, struct partial_symtab *pst)
+end_psymtab_common (struct partial_symtab *pst)
 {
   pst->global_psymbols.shrink_to_fit ();
   pst->static_psymbols.shrink_to_fit ();
 
-  sort_pst_symbols (objfile, pst);
+  sort_pst_symbols (pst);
 }
 
 /* See psymtab.h.  */
diff --git a/gdb/xcoffread.c b/gdb/xcoffread.c
index 075ebee7012..3383032d1f3 100644
--- a/gdb/xcoffread.c
+++ b/gdb/xcoffread.c
@@ -2000,7 +2000,7 @@ xcoff_end_psymtab (struct objfile *objfile, legacy_psymtab *pst,
     first_fun_line_offset;
   first_fun_line_offset = 0;
 
-  end_psymtab_common (objfile, pst);
+  end_psymtab_common (pst);
 
   pst->number_of_dependencies = number_dependencies;
   if (number_dependencies)
-- 
2.17.2



More information about the Gdb-patches mailing list