diff mbox series

[12/27] Convert block_containing_function to method

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

diff mbox series

Patch

diff --git a/gdb/block.c b/gdb/block.c
index dca6ff36f3b..31916ce48dc 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -100,14 +100,13 @@  block::linkage_function () const
   return bl->function ();
 }
 
-/* Return the symbol for the function which contains a specified
-   block, described by a struct block BL.  The return value will be
-   the closest enclosing function, which might be an inline
-   function.  */
+/* See block.h.  */
 
 struct symbol *
-block_containing_function (const struct block *bl)
+block::containing_function () const
 {
+  const block *bl = this;
+
   while (bl->function () == NULL && bl->superblock () != NULL)
     bl = bl->superblock ();
 
diff --git a/gdb/block.h b/gdb/block.h
index d1f4409d863..9f1ba935abb 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -238,6 +238,13 @@  struct block
 
   struct symbol *linkage_function () const;
 
+  /* Return the symbol for the function which contains a specified
+     block, described by a struct block.  The return value will be the
+     closest enclosing function, which might be an inline
+     function.  */
+
+  struct symbol *containing_function () const;
+
   /* Addresses in the executable code that are in this block.  */
 
   CORE_ADDR m_start;
@@ -371,8 +378,6 @@  struct blockvector
   struct block *m_blocks[1];
 };
 
-extern struct symbol *block_containing_function (const struct block *);
-
 /* Return true if block A is lexically nested within block B, or if a
    and b have the same pc range.  Return false otherwise.  If
    ALLOW_NESTED is true, then block A is considered to be in block B
diff --git a/gdb/blockframe.c b/gdb/blockframe.c
index 65183b1946b..7c9faf487a7 100644
--- a/gdb/blockframe.c
+++ b/gdb/blockframe.c
@@ -162,7 +162,7 @@  find_pc_sect_containing_function (CORE_ADDR pc, struct obj_section *section)
   if (bl == nullptr)
     return nullptr;
 
-  return block_containing_function (bl);
+  return bl->containing_function ();
 }
 
 /* These variables are used to cache the most recent result of
diff --git a/gdb/linespec.c b/gdb/linespec.c
index d3def7ae070..61da545eb2e 100644
--- a/gdb/linespec.c
+++ b/gdb/linespec.c
@@ -2128,7 +2128,7 @@  create_sals_line_offset (struct linespec_state *self,
 	if (filter[i])
 	  {
 	    struct symbol *sym = (blocks[i]
-				  ? block_containing_function (blocks[i])
+				  ? blocks[i]->containing_function ()
 				  : NULL);
 
 	    if (self->funfirstline)