From patchwork Wed Jan 9 03:34:20 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 31005 Received: (qmail 37023 invoked by alias); 9 Jan 2019 03:34:36 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Delivered-To: mailing list gdb-patches@sourceware.org Received: (qmail 36689 invoked by uid 89); 9 Jan 2019 03:34:34 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS autolearn=ham version=3.3.2 spammy=Never, reading X-HELO: gateway32.websitewelcome.com Received: from gateway32.websitewelcome.com (HELO gateway32.websitewelcome.com) (192.185.145.111) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 09 Jan 2019 03:34:31 +0000 Received: from cm13.websitewelcome.com (cm13.websitewelcome.com [100.42.49.6]) by gateway32.websitewelcome.com (Postfix) with ESMTP id 6C8D110393F for ; Tue, 8 Jan 2019 21:34:30 -0600 (CST) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id h4dSgZ2iWYTGMh4dSgKPBx; Tue, 08 Jan 2019 21:34:30 -0600 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=tromey.com; s=default; h=References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From: Sender:Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Yvkhie5LBQ51CuIveYdVXWFT59mLwI683/j8vsRHmlQ=; b=OgssndGHHlIxGPcMLw7Zn1IXQ+ sov2/0a5OsnZjvXQSwxjg3RlC/G9A5EbypNoa3vITd04MbPPKzoaM20UWcKljMAVcBuaG71o0DzP6 KZ6qVwzi114i8oNzXsXldfzUn; Received: from 75-166-72-210.hlrn.qwest.net ([75.166.72.210]:47026 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.91) (envelope-from ) id 1gh4dS-000HG2-7R; Tue, 08 Jan 2019 21:34:30 -0600 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [PATCH 06/12] Remove clear_symtab_users_cleanup Date: Tue, 8 Jan 2019 20:34:20 -0700 Message-Id: <20190109033426.16062-7-tom@tromey.com> In-Reply-To: <20190109033426.16062-1-tom@tromey.com> 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 * 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 #include @@ -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 defer_clear_users; std::unique_ptr 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 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.