diff mbox series

[24/27] Have global_block inherit from block

Message ID	20230120214618.3236224-25-tom@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 9AEE7385B521 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 24/27] Have global_block inherit from block Date: Fri, 20 Jan 2023 14:46:15 -0700 Message-Id: <20230120214618.3236224-25-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:46 p.m. UTC

  This changes global_block to inherit from block, which is what was
always intended.
---
 gdb/block.c | 4 +---
 gdb/block.h | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff mbox series

Patch

diff --git a/gdb/block.c b/gdb/block.c
index 8f15cdf23f8..1698ee51e7b 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -397,9 +397,7 @@  allocate_block (struct obstack *obstack)
 struct block *
 allocate_global_block (struct obstack *obstack)
 {
-  struct global_block *bl = new (obstack) struct global_block;
-
-  return &bl->block;
+  return new (obstack) struct global_block;
 }
 
 /* See block.h.  */
diff --git a/gdb/block.h b/gdb/block.h
index 9a60140581d..3d71e7daab1 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -314,12 +314,8 @@  struct block : public allocate_on_obstack
 /* The global block is singled out so that we can provide a back-link
    to the compunit symtab.  */
 
-struct global_block : public allocate_on_obstack
+struct global_block : public block
 {
-  /* The block.  */
-
-  struct block block;
-
   /* This holds a pointer to the compunit symtab holding this block.  */
 
   struct compunit_symtab *compunit_symtab = nullptr;