Remove make_cleanup_discard_psymtabs

This removes make_cleanup_discard_psymtabs in favor of a new class.

2017-01-10  Tom Tromey  <tom@tromey.com>

	* dwarf2read.c (dwarf2_build_psymtabs): Use psymtab_discarder.
	* psympriv.h (make_cleanup_discard_psymtabs): Don't declare.
	* psymtab.c (discard_psymtabs_upto): Remove.
	(make_cleanup_discard_psymtabs): Remove.
	(struct psymtab_state): Remove.
This commit is contained in:
Tom Tromey
2016-11-21 16:50:20 -07:00
parent bef155c3e8
commit 906768f970
4 changed files with 45 additions and 42 deletions

View File

@ -21,6 +21,7 @@
#define PSYMPRIV_H
#include "psymtab.h"
#include "objfiles.h"
struct psymbol_allocation_list;
@ -225,7 +226,40 @@ extern struct partial_symtab *allocate_psymtab (const char *,
extern void discard_psymtab (struct objfile *, struct partial_symtab *);
extern struct cleanup *make_cleanup_discard_psymtabs (struct objfile *);
/* Used when recording partial symbol tables. On destruction,
discards any partial symbol tables that have been built. However,
the tables can be kept by calling the "keep" method. */
class psymtab_discarder
{
public:
psymtab_discarder (struct objfile *objfile)
: m_objfile (objfile),
m_psymtab (objfile->psymtabs)
{
}
~psymtab_discarder ()
{
if (m_objfile != NULL)
while (m_objfile->psymtabs != m_psymtab)
discard_psymtab (m_objfile, m_objfile->psymtabs);
}
/* Keep any partial symbol tables that were built. */
void keep ()
{
m_objfile = NULL;
}
private:
/* The objfile. If NULL this serves as a sentinel to indicate that
the psymtabs should be kept. */
struct objfile *m_objfile;
/* How far back to free. */
struct partial_symtab *m_psymtab;
};
/* Traverse all psymtabs in one objfile. */