From patchwork Wed May 23 04:58:45 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Tromey X-Patchwork-Id: 27455 Received: (qmail 101166 invoked by alias); 23 May 2018 06:16:23 -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 100228 invoked by uid 89); 23 May 2018 06:15:29 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=AWL, 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= X-HELO: gateway34.websitewelcome.com Received: from gateway34.websitewelcome.com (HELO gateway34.websitewelcome.com) (192.185.149.105) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 23 May 2018 06:15:25 +0000 Received: from cm10.websitewelcome.com (cm10.websitewelcome.com [100.42.49.4]) by gateway34.websitewelcome.com (Postfix) with ESMTP id 702135286A for ; Wed, 23 May 2018 01:15:08 -0500 (CDT) Received: from box5379.bluehost.com ([162.241.216.53]) by cmsmtp with SMTP id LN3Efx2k9BcCXLN3EfrTZN; Wed, 23 May 2018 01:15:08 -0500 X-Authority-Reason: nr=8 Received: from 174-29-44-154.hlrn.qwest.net ([174.29.44.154]:56108 helo=bapiya.Home) by box5379.bluehost.com with esmtpsa (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.89_1) (envelope-from ) id 1fLLri-003S5D-S2; Tue, 22 May 2018 23:59:10 -0500 From: Tom Tromey To: gdb-patches@sourceware.org Cc: Tom Tromey Subject: [RFA 36/42] Remove reset_symtab_globals Date: Tue, 22 May 2018 22:58:45 -0600 Message-Id: <20180523045851.11660-37-tom@tromey.com> In-Reply-To: <20180523045851.11660-1-tom@tromey.com> References: <20180523045851.11660-1-tom@tromey.com> X-BWhitelist: no X-Source-L: No X-Exim-ID: 1fLLri-003S5D-S2 X-Source-Sender: 174-29-44-154.hlrn.qwest.net (bapiya.Home) [174.29.44.154]:56108 X-Source-Auth: tom+tromey.com X-Email-Count: 4 X-Source-Cap: ZWx5bnJvYmk7ZWx5bnJvYmk7Ym94NTM3OS5ibHVlaG9zdC5jb20= X-Local-Domain: yes This patch arranges for the remaining buildsym global -- buildsym_compunit -- to only be cleared by the wrapper functions, not by methods on struct buildsym_compunit. In the process, reset_symtab_globals is removed. 2018-05-22 Tom Tromey * buildsym.c (reset_symtab_globals): Remove. (buildsym_compunit::end_symtab_from_static_block): Update. (buildsym_compunit::augment_type_symtab): Update. (end_symtab_from_static_block): Call free_buildsym_compunit. (augment_type_symtab, end_symtab, end_expandable_symtab): Likewise. --- gdb/ChangeLog | 9 +++++++++ gdb/buildsym.c | 20 ++++---------------- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/gdb/buildsym.c b/gdb/buildsym.c index b9be6dd61a..16756d8835 100644 --- a/gdb/buildsym.c +++ b/gdb/buildsym.c @@ -1251,14 +1251,6 @@ buildsym_compunit::watch_main_source_file_lossage () } } -/* Reset state after a successful building of a symtab. */ - -static void -reset_symtab_globals (void) -{ - free_buildsym_compunit (); -} - /* Implementation of the first part of end_symtab. It allows modifying STATIC_BLOCK before it gets finalized by end_symtab_from_static_block. If the returned value is NULL there is no blockvector created for @@ -1562,8 +1554,6 @@ buildsym_compunit::end_symtab_from_static_block (struct block *static_block, else cu = end_symtab_with_blockvector (static_block, section, expandable); - reset_symtab_globals (); - return cu; } @@ -1672,8 +1662,6 @@ buildsym_compunit::augment_type_symtab () dict_add_pending (BLOCK_DICT (block), m_global_symbols); } - - reset_symtab_globals (); } /* Push a context block. Args are an identifying nesting level @@ -1899,7 +1887,7 @@ end_symtab_from_static_block (struct block *static_block, struct compunit_symtab *result = buildsym_compunit->end_symtab_from_static_block (static_block, section, expandable); - reset_symtab_globals (); + free_buildsym_compunit (); return result; } @@ -1909,7 +1897,7 @@ end_symtab (CORE_ADDR end_addr, int section) gdb_assert (buildsym_compunit != nullptr); struct compunit_symtab *result = buildsym_compunit->end_symtab (end_addr, section); - reset_symtab_globals (); + free_buildsym_compunit (); return result; } @@ -1919,7 +1907,7 @@ end_expandable_symtab (CORE_ADDR end_addr, int section) gdb_assert (buildsym_compunit != nullptr); struct compunit_symtab *result = buildsym_compunit->end_expandable_symtab (end_addr, section); - reset_symtab_globals (); + free_buildsym_compunit (); return result; } @@ -1928,7 +1916,7 @@ augment_type_symtab () { gdb_assert (buildsym_compunit != nullptr); buildsym_compunit->augment_type_symtab (); - reset_symtab_globals (); + free_buildsym_compunit (); } struct context_stack *