Change count_psyms to be a method on psymbol_functions

This removes a use of objfile->psymtabs by changing count_psyms to be
a method on psymbol_functions.

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

	* psymtab.c (psymbol_functions::count_psyms): Rename.
	(psymbol_functions::print_stats): Update.
	* psympriv.h (struct psymbol_functions) <count_psyms>: Declare
	method.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3abf801bea038188880f552401b28f666de7a43a..cd9c17c3f1791d3672bbd2b546037ebd42adf67c 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,10 @@
+2021-03-20  Tom Tromey  <tom@tromey.com>
+
+       * psymtab.c (psymbol_functions::count_psyms): Rename.
+       (psymbol_functions::print_stats): Update.
+       * psympriv.h (struct psymbol_functions) <count_psyms>: Declare
+       method.
+
 2021-03-20  Tom Tromey  <tom@tromey.com>
 
        * psymtab.c (psymbol_functions::require_partial_symbols): Rename.

diff --git a/gdb/psympriv.h b/gdb/psympriv.h
index 85651f522d22dc4dd518364be4015e768339a1d7..b6139111b6e5139661e9236290ffde4c3584aaf6 100644 (file)
--- a/gdb/psympriv.h
+++ b/gdb/psympriv.h
@@ -591,6 +591,9 @@ struct psymbol_functions : public quick_symbol_functions
 
 private:
 
+  /* Count the number of partial symbols in *THIS.  */
+  int count_psyms ();
+
   void fill_psymbol_map (struct objfile *objfile,
                         struct partial_symtab *psymtab,
                         std::set<CORE_ADDR> *seen_addrs,

diff --git a/gdb/psymtab.c b/gdb/psymtab.c
index b2f929912ea00aec0e18674f4689f7827a3a3330..3f3b55968642b8f6c2d9ceae064f07b842f66cd6 100644 (file)
--- a/gdb/psymtab.c
+++ b/gdb/psymtab.c
@@ -962,11 +962,11 @@ dump_psymtab (struct objfile *objfile, struct partial_symtab *psymtab,
 
 /* Count the number of partial symbols in OBJFILE.  */
 
-static int
-count_psyms (struct objfile *objfile)
+int
+psymbol_functions::count_psyms ()
 {
   int count = 0;
-  for (partial_symtab *pst : objfile->psymtabs ())
+  for (partial_symtab *pst : m_partial_symtabs->range ())
     {
       count += pst->global_psymbols.size ();
       count += pst->static_psymbols.size ();
@@ -984,7 +984,7 @@ psymbol_functions::print_stats (struct objfile *objfile, bool print_bcache)
 
   if (!print_bcache)
     {
-      int n_psyms = count_psyms (objfile);
+      int n_psyms = count_psyms ();
       if (n_psyms > 0)
        printf_filtered (_("  Number of \"partial\" symbols read: %d\n"),
                         n_psyms);