This is the mail archive of the
gdb-patches@sourceware.org
mailing list for the GDB project.
[PATCH 06/12] Remove clear_symtab_users_cleanup
- From: Tom Tromey <tom at tromey dot com>
- To: gdb-patches at sourceware dot org
- Cc: Tom Tromey <tom at tromey dot com>
- Date: Tue, 8 Jan 2019 20:34:20 -0700
- Subject: [PATCH 06/12] Remove clear_symtab_users_cleanup
- References: <20190109033426.16062-1-tom@tromey.com>
This removes clear_symtab_users_cleanup, replacing it with uses of
cleanup_function.
gdb/ChangeLog
2019-01-08 Tom Tromey <tom@tromey.com>
* symfile.c (syms_from_objfile_1): Use cleanup_function.
(clear_symtab_users_cleanup): Remove.
(reread_symbols): Use cleanup_function.
---
gdb/ChangeLog | 6 ++++++
gdb/symfile.c | 31 ++++++++++++++++---------------
2 files changed, 22 insertions(+), 15 deletions(-)
diff --git a/gdb/symfile.c b/gdb/symfile.c
index 8858098f48..e5ac521451 100644
--- a/gdb/symfile.c
+++ b/gdb/symfile.c
@@ -59,6 +59,7 @@
#include "common/byte-vector.h"
#include "selftest.h"
#include "cli/cli-style.h"
+#include "common/cleanup-function.h"
#include <sys/types.h>
#include <fcntl.h>
@@ -79,8 +80,6 @@ void (*deprecated_show_load_progress) (const char *section,
void (*deprecated_pre_add_symbol_hook) (const char *);
void (*deprecated_post_add_symbol_hook) (void);
-static void clear_symtab_users_cleanup (void *ignore);
-
/* Global variables owned by this file. */
int readnow_symbol_files; /* Read full symbols immediately. */
int readnever_symbol_files; /* Never read full symbols. */
@@ -923,7 +922,6 @@ syms_from_objfile_1 (struct objfile *objfile,
symfile_add_flags add_flags)
{
section_addr_info local_addr;
- struct cleanup *old_chain;
const int mainline = add_flags & SYMFILE_MAINLINE;
objfile_set_sym_fns (objfile, find_sym_fns (objfile->obfd));
@@ -945,7 +943,12 @@ syms_from_objfile_1 (struct objfile *objfile,
/* Make sure that partially constructed symbol tables will be cleaned up
if an error occurs during symbol reading. */
- old_chain = make_cleanup (null_cleanup, NULL);
+ auto clear_users_func
+ = [] ()
+ {
+ clear_symtab_users (0);
+ };
+ gdb::optional<cleanup_function> defer_clear_users;
std::unique_ptr<struct objfile> objfile_holder (objfile);
/* If ADDRS is NULL, put together a dummy address list.
@@ -958,7 +961,7 @@ syms_from_objfile_1 (struct objfile *objfile,
{
/* We will modify the main symbol table, make sure that all its users
will be cleaned up if an error occurs during symbol reading. */
- make_cleanup (clear_symtab_users_cleanup, 0 /*ignore*/);
+ defer_clear_users.emplace (clear_users_func);
/* Since no error yet, throw away the old symbol table. */
@@ -999,7 +1002,7 @@ syms_from_objfile_1 (struct objfile *objfile,
/* Discard cleanups as symbol reading was successful. */
objfile_holder.release ();
- discard_cleanups (old_chain);
+ defer_clear_users->cancel ();
}
/* Same as syms_from_objfile_1, but also initializes the objfile
@@ -2434,7 +2437,6 @@ reread_symbols (void)
new_modtime = new_statbuf.st_mtime;
if (new_modtime != objfile->mtime)
{
- struct cleanup *old_cleanups;
struct section_offsets *offsets;
int num_offsets;
@@ -2454,7 +2456,12 @@ reread_symbols (void)
std::unique_ptr<struct objfile> objfile_holder (objfile);
/* We need to do this whenever any symbols go away. */
- old_cleanups = make_cleanup (clear_symtab_users_cleanup, 0 /*ignore*/);
+ auto clear_users_func
+ = [] ()
+ {
+ clear_symtab_users (0);
+ };
+ cleanup_function defer_clear_users (clear_users_func);
if (exec_bfd != NULL
&& filename_cmp (bfd_get_filename (objfile->obfd),
@@ -2618,7 +2625,7 @@ reread_symbols (void)
/* Discard cleanups as symbol reading was successful. */
objfile_holder.release ();
- discard_cleanups (old_cleanups);
+ defer_clear_users.cancel ();
/* If the mtime has changed between the time we set new_modtime
and now, we *want* this to be out of date, so don't call stat
@@ -2895,12 +2902,6 @@ clear_symtab_users (symfile_add_flags add_flags)
if ((add_flags & SYMFILE_DEFER_BP_RESET) == 0)
breakpoint_re_set ();
}
-
-static void
-clear_symtab_users_cleanup (void *ignore)
-{
- clear_symtab_users (0);
-}
/* OVERLAYS:
The following code implements an abstraction for debugging overlay sections.
--
2.17.2