diff mbox series

[02/27] Avoid extra allocations in block

Message ID	20230120214618.3236224-3-tom@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 7333F3858C52 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 02/27] Avoid extra allocations in block Date: Fri, 20 Jan 2023 14:45:53 -0700 Message-Id: <20230120214618.3236224-3-tom@tromey.com> In-Reply-To: <20230120214618.3236224-1-tom@tromey.com> References: <20230120214618.3236224-1-tom@tromey.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list Errors-To: gdb-patches-bounces+patchwork=sourceware.org@sourceware.org Sender: "Gdb-patches" <gdb-patches-bounces+patchwork=sourceware.org@sourceware.org>
Series	C++-ify struct block \| [00/27] C++-ify struct block [01/27] Rearrange block.c to avoid a forward declaration [02/27] Avoid extra allocations in block [03/27] Don't allow NULL as an argument to block_scope [04/27] Don't allow NULL as an argument to block_using [05/27] Don't allow NULL as an argument to block_static_block [06/27] Don't allow NULL as an argument to block_global_block [07/27] Convert block_objfile to method [08/27] Convert block_gdbarch to method [09/27] Convert block_inlined_p to method [10/27] Convert more block functions to methods [11/27] Convert block_linkage_function to method [12/27] Convert block_containing_function to method [13/27] Convert block_static_block and block_global_block to methods [14/27] Convert set_block_compunit_symtab to method [15/27] Convert block_static_link to method [16/27] Store 'name' in block_iterator [17/27] Combine both styles of block iterator [18/27] Introduce a block iterator wrapper [19/27] Convert explicit iterator uses to foreach [20/27] Remove ALL_BLOCK_SYMBOLS_WITH_NAME [21/27] Remove ALL_BLOCK_SYMBOLS [22/27] Fix memory leak in mdebugread.c [23/27] Use 'new' for block and global_block [24/27] Have global_block inherit from block [25/27] Remove allocate_block and allocate_global_block [26/27] Make block members 'private' [27/27] Convert contained_in to method

Commit Message

Tom Tromey Jan. 20, 2023, 9:45 p.m. UTC

  block_set_scope and block_set_using unconditionally allocate the block
namespace object.  However, this isn't truly needed, so arrange to
only allocate when it is.
---
 gdb/block.c | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff mbox series

Patch

diff --git a/gdb/block.c b/gdb/block.c
index 751f67d30f7..f24a2b5d084 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -320,6 +320,12 @@  void
 block_set_scope (struct block *block, const char *scope,
 		 struct obstack *obstack)
 {
+  if (scope == nullptr || scope[0] == '\0')
+    {
+      /* Don't bother.  */
+      return;
+    }
+
   block_initialize_namespace (block, obstack);
 
   block->namespace_info ()->scope = scope;
@@ -346,6 +352,12 @@  block_set_using (struct block *block,
 		 struct using_direct *using_decl,
 		 struct obstack *obstack)
 {
+  if (using_decl == nullptr)
+    {
+      /* Don't bother.  */
+      return;
+    }
+
   block_initialize_namespace (block, obstack);
 
   block->namespace_info ()->using_decl = using_decl;