From 286526c1e5f6d54bf6ecc961d7c2d0a32b58fe45 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Wed, 23 Jan 2019 18:58:34 +0000 Subject: [PATCH] Remove clear_symtab_users_cleanup This removes clear_symtab_users_cleanup, replacing it with uses of forward_scope_exit. gdb/ChangeLog: 2019-01-23 Tom Tromey Pedro Alves * symfile.c: Include forward-scope-exit.h. (clear_symtab_users_cleanup): Replace forward declaration with a FORWARD_SCOPE_EXIT. (syms_from_objfile_1): Use the forward_scope_exit and gdb::optional instead of cleanup_function. (reread_symbols): Use the forward_scope_exit instead of cleanup_function. (clear_symtab_users_cleanup): Remove function. --- gdb/ChangeLog | 12 ++++++++++++ gdb/symfile.c | 24 ++++++++++-------------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 4ee6051..4f53675 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,6 +1,18 @@ 2019-01-23 Tom Tromey Pedro Alves + * symfile.c: Include forward-scope-exit.h. + (clear_symtab_users_cleanup): Replace forward declaration with + a FORWARD_SCOPE_EXIT. + (syms_from_objfile_1): Use the forward_scope_exit and + gdb::optional instead of cleanup_function. + (reread_symbols): Use the forward_scope_exit instead of + cleanup_function. + (clear_symtab_users_cleanup): Remove function. + +2019-01-23 Tom Tromey + Pedro Alves + * linux-nat.c: Include scope-exit.h. (cleanup_target_stop): Remove. (linux_nat_target::static_tracepoint_markers_by_strid): Use diff --git a/gdb/symfile.c b/gdb/symfile.c index 7f800ad..4875cbf 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/forward-scope-exit.h" #include #include @@ -79,7 +80,8 @@ 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); +using clear_symtab_users_cleanup + = FORWARD_SCOPE_EXIT (clear_symtab_users); /* Global variables owned by this file. */ int readnow_symbol_files; /* Read full symbols immediately. */ @@ -923,7 +925,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 +946,8 @@ 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); + gdb::optional defer_clear_users; + std::unique_ptr objfile_holder (objfile); /* If ADDRS is NULL, put together a dummy address list. @@ -958,7 +960,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 ((symfile_add_flag) 0); /* Since no error yet, throw away the old symbol table. */ @@ -999,7 +1001,8 @@ syms_from_objfile_1 (struct objfile *objfile, /* Discard cleanups as symbol reading was successful. */ objfile_holder.release (); - discard_cleanups (old_chain); + if (defer_clear_users) + defer_clear_users->release (); } /* Same as syms_from_objfile_1, but also initializes the objfile @@ -2441,7 +2444,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; @@ -2461,7 +2463,7 @@ reread_symbols (void) std::unique_ptr objfile_holder (objfile); /* We need to do this whenever any symbols go away. */ - old_cleanups = make_cleanup (clear_symtab_users_cleanup, 0 /*ignore*/); + clear_symtab_users_cleanup defer_clear_users (0); if (exec_bfd != NULL && filename_cmp (bfd_get_filename (objfile->obfd), @@ -2615,7 +2617,7 @@ reread_symbols (void) /* Discard cleanups as symbol reading was successful. */ objfile_holder.release (); - discard_cleanups (old_cleanups); + defer_clear_users.release (); /* 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 @@ -2892,12 +2894,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.7.4