diff mbox series

[14/27] Convert set_block_compunit_symtab to method

Message ID	20230120214618.3236224-15-tom@tromey.com
State	New
Headers	DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8BD2F385AC39 From: Tom Tromey <tom@tromey.com> To: gdb-patches@sourceware.org Cc: Tom Tromey <tom@tromey.com> Subject: [PATCH 14/27] Convert set_block_compunit_symtab to method Date: Fri, 20 Jan 2023 14:46:05 -0700 Message-Id: <20230120214618.3236224-15-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 converts set_block_compunit_symtab to be a method.  This was
mostly written by script.
---
 gdb/block.c    | 8 ++++----
 gdb/block.h    | 7 ++++---
 gdb/buildsym.c | 2 +-
 gdb/jit.c      | 2 +-
 4 files changed, 10 insertions(+), 9 deletions(-)

diff mbox series

Patch

diff --git a/gdb/block.c b/gdb/block.c
index c0d6ed7da97..3cd90dcb4ed 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -404,15 +404,15 @@  allocate_global_block (struct obstack *obstack)
   return &bl->block;
 }
 
-/* Set the compunit of the global block.  */
+/* See block.h.  */
 
 void
-set_block_compunit_symtab (struct block *block, struct compunit_symtab *cu)
+block::set_compunit_symtab (struct compunit_symtab *cu)
 {
   struct global_block *gb;
 
-  gdb_assert (block->superblock () == NULL);
-  gb = (struct global_block *) block;
+  gdb_assert (superblock () == NULL);
+  gb = (struct global_block *) this;
   gdb_assert (gb->compunit_symtab == NULL);
   gb->compunit_symtab = cu;
 }
diff --git a/gdb/block.h b/gdb/block.h
index 9ce8ef51945..ce8c9679a07 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -254,6 +254,10 @@  struct block
 
   const struct block *global_block () const;
 
+  /* Set the compunit of this block, which must be a global block.  */
+
+  void set_compunit_symtab (struct compunit_symtab *);
+
   /* Addresses in the executable code that are in this block.  */
 
   CORE_ADDR m_start;
@@ -417,9 +421,6 @@  extern struct block *allocate_block (struct obstack *obstack);
 
 extern struct block *allocate_global_block (struct obstack *obstack);
 
-extern void set_block_compunit_symtab (struct block *,
-				       struct compunit_symtab *);
-
 /* Return a property to evaluate the static link associated to BLOCK.
 
    In the context of nested functions (available in Pascal, Ada and GNU C, for
diff --git a/gdb/buildsym.c b/gdb/buildsym.c
index fd76e56599d..7a009c2f626 100644
--- a/gdb/buildsym.c
+++ b/gdb/buildsym.c
@@ -970,7 +970,7 @@  buildsym_compunit::end_compunit_symtab_with_blockvector
   {
     struct block *b = blockvector->global_block ();
 
-    set_block_compunit_symtab (b, cu);
+    b->set_compunit_symtab (cu);
   }
 
   cu->set_block_line_section (section);
diff --git a/gdb/jit.c b/gdb/jit.c
index 48bfef0a026..f584438c229 100644
--- a/gdb/jit.c
+++ b/gdb/jit.c
@@ -623,7 +623,7 @@  finalize_symtab (struct gdb_symtab *stab, struct objfile *objfile)
       bv->set_block (i, new_block);
 
       if (i == GLOBAL_BLOCK)
-	set_block_compunit_symtab (new_block, cust);
+	new_block->set_compunit_symtab (cust);
     }
 
   /* Fill up the superblock fields for the real blocks, using the