[PATCH 07/10] [gdb] Add block::block_and_superblocks

[Tom de Vries <tdevries@suse.de>]

Add a function block::block_and_superblocks that can be used to transform:
...
  while (block != NULL)
    {
      ...
      block = block->superblock ();
    }
...
into:
...
  for (auto b : block::block_and_superblocks (block))
    {
      ...
    }
...
---
 gdb/block.h | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/gdb/block.h b/gdb/block.h
index b70b27f6509..ff5203ae4c6 100644
--- a/gdb/block.h
+++ b/gdb/block.h
@@ -108,6 +108,27 @@ struct blockranges
 
 struct block : public allocate_on_obstack<block>
 {
+  /* Variant of next_iterator using the superblock field instead of next.  */
+  struct superblock_iterator
+    : base_next_iterator<const block, superblock_iterator>
+  {
+    typedef superblock_iterator self_type;
+
+    explicit superblock_iterator (value_type item)
+      : base_next_iterator (item)
+    {
+    }
+
+    superblock_iterator () = default;
+
+    value_type next ()
+    {
+      return m_item->superblock ();
+    }
+  };
+
+  using superblock_range = iterator_range<superblock_iterator>;
+
   /* Return this block's start address.  */
   CORE_ADDR start () const
   { return m_start; }
@@ -311,6 +332,26 @@ struct block : public allocate_on_obstack<block>
 
   struct dynamic_prop *static_link () const;
 
+  /* Return a range adapter that iterates over this block and its
+     superblocks.  */
+
+  superblock_range block_and_superblocks () const
+  {
+    superblock_range::iterator begin (this);
+
+    return superblock_range (std::move (begin));
+  }
+
+  /* Return a range adapter that iterates over B and its superblocks.  */
+
+  static superblock_range block_and_superblocks (const block *b)
+  {
+    if (b == nullptr)
+      return superblock_range ();
+
+    return b->block_and_superblocks ();
+  }
+
   /* Return true if block A is lexically nested within this block, or
      if A and this block have the same pc range.  Return false
      otherwise.  If ALLOW_NESTED is true, then block A is considered
-- 
2.51.0