Add block::function_block

This adds the method block::function_block, to easily access a block's
enclosing function block.

(cherry picked from commit ba707cadae18a7cc8bb47a736d3d0438d44262a9)

2 files changed, 19 insertions, 0 deletions

diff --git a/gdb/block.c b/gdb/block.c
index 6ada69c..e588a68 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -378,6 +378,19 @@ block::global_block () const
 
 /* See block.h.  */
 
+const struct block *
+block::function_block () const
+{
+  const block *block = this;
+
+  while (block != nullptr && block->function () == nullptr)
+    block = block->superblock ();
+
+  return block;
+}
+
+/* See block.h.  */
+
 void
 block::set_compunit_symtab (struct compunit_symtab *cu)
 {
diff --git a/gdb/block.h b/gdb/block.h
index 9fccbe0..a292985 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -273,6 +273,12 @@ struct block : public allocate_on_obstack
   bool is_global_block () const
   { return superblock () == nullptr; }
 
+  /* Return the function block for this block.  Returns nullptr if
+     there is no enclosing function, i.e., if this block is a static
+     or global block.  */
+
+  const struct block *function_block () const;
+
   /* Set the compunit of this block, which must be a global block.  */
 
   void set_compunit_symtab (struct compunit_symtab *);