From caf8c1e5071295d25f3843d5d39541df24b45787 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Sat, 20 Mar 2021 17:23:40 -0600 Subject: [PATCH] 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 * psymtab.c (psymbol_functions::count_psyms): Rename. (psymbol_functions::print_stats): Update. * psympriv.h (struct psymbol_functions) : Declare method. --- gdb/ChangeLog | 7 +++++++ gdb/psympriv.h | 3 +++ gdb/psymtab.c | 8 ++++---- 3 files changed, 14 insertions(+), 4 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 3abf801bea0..cd9c17c3f17 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,10 @@ +2021-03-20 Tom Tromey + + * psymtab.c (psymbol_functions::count_psyms): Rename. + (psymbol_functions::print_stats): Update. + * psympriv.h (struct psymbol_functions) : Declare + method. + 2021-03-20 Tom Tromey * psymtab.c (psymbol_functions::require_partial_symbols): Rename. diff --git a/gdb/psympriv.h b/gdb/psympriv.h index 85651f522d2..b6139111b6e 100644 --- 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 *seen_addrs, diff --git a/gdb/psymtab.c b/gdb/psymtab.c index b2f929912ea..3f3b5596864 100644 --- 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); -- 2.30.2