From abaa2f2340a400fd19aea2973f705fe813d620d4 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 22 Oct 2019 16:51:55 -0600 Subject: [PATCH] Do not allocate psymtabs via psymtab_storage Currently, partial symbol tables are allocated by a method in psymtab_storage. However, eventually we want to subclass partial symtabs in the symbol readers, so the calls to "new" will have to happen there. This patch is a first step, moving the allocation from psymtab_storage and into allocate_psymtab. gdb/ChangeLog 2020-01-26 Tom Tromey * psymtab.h (class psymtab_storage) : Rename from allocate_psymtab. Update documentation. * psymtab.c (psymtab_storage::install_psymtab): Rename from allocate_psymtab. Do not use new. (allocate_psymtab): Use new. Update. Change-Id: Iba6a9bf3ee1e78062fdb9f007c3010f826f64bc8 --- gdb/ChangeLog | 8 ++++++++ gdb/psymtab.c | 16 ++++++---------- gdb/psymtab.h | 7 +++---- 3 files changed, 17 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 345a81c935..475ebbb116 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,11 @@ +2020-01-26 Tom Tromey + + * psymtab.h (class psymtab_storage) : Rename from + allocate_psymtab. Update documentation. + * psymtab.c (psymtab_storage::install_psymtab): Rename from + allocate_psymtab. Do not use new. + (allocate_psymtab): Use new. Update. + 2020-01-26 Tom Tromey * xcoffread.c (xcoff_psymtab_to_symtab_1): Update. diff --git a/gdb/psymtab.c b/gdb/psymtab.c index 037ed19182..975737c559 100644 --- a/gdb/psymtab.c +++ b/gdb/psymtab.c @@ -75,15 +75,11 @@ psymtab_storage::~psymtab_storage () /* See psymtab.h. */ -struct partial_symtab * -psymtab_storage::allocate_psymtab () +void +psymtab_storage::install_psymtab (partial_symtab *pst) { - struct partial_symtab *psymtab = new struct partial_symtab; - - psymtab->next = psymtabs; - psymtabs = psymtab; - - return psymtab; + pst->next = psymtabs; + psymtabs = pst; } @@ -1653,8 +1649,8 @@ init_psymbol_list (struct objfile *objfile, int total_symbols) struct partial_symtab * allocate_psymtab (const char *filename, struct objfile *objfile) { - struct partial_symtab *psymtab - = objfile->partial_symtabs->allocate_psymtab (); + struct partial_symtab *psymtab = new partial_symtab; + objfile->partial_symtabs->install_psymtab (psymtab); psymtab->filename = ((const char *) objfile->per_bfd->filename_cache.insert diff --git a/gdb/psymtab.h b/gdb/psymtab.h index c0f0a97eb2..d66547418c 100644 --- a/gdb/psymtab.h +++ b/gdb/psymtab.h @@ -83,11 +83,10 @@ public: return OBSTACK_CALLOC (obstack (), number, struct partial_symtab *); } - /* Allocate a new psymtab on the psymtab obstack. The new psymtab - will be linked in to the "psymtabs" list, but otherwise all other - fields will be zero. */ + /* Install a psymtab on the psymtab list. This transfers ownership + of PST to this object. */ - struct partial_symtab *allocate_psymtab (); + void install_psymtab (partial_symtab *pst); typedef next_adapter partial_symtab_range; -- 2.34.1