[PATCH 09/13] [gdb/symtab] Keep track of processed DIEs in shard

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

For optimizations in two following patches, we keep track in each shard which
DIEs have been processed.

Tested on x86_64-linux.
---
 gdb/dwarf2/cooked-index.c |  2 ++
 gdb/dwarf2/cooked-index.h | 15 +++++++++++++++
 gdb/dwarf2/read.c         | 32 ++++++++++++++++++++++++++++++++
 3 files changed, 49 insertions(+)

diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 68b5644cf23..478c66a24c4 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -730,6 +730,8 @@ cooked_index::handle_deferred_entries ()
       shard->m_die_range_map = nullptr;
       delete shard->m_deferred_entries;
       shard->m_deferred_entries = nullptr;
+      delete shard->m_die_range_map_valid;
+      shard->m_die_range_map_valid = nullptr;
     }
 }
 
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index 3a582d187c2..064944aa09a 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -315,6 +315,7 @@ class cooked_index_shard
   cooked_index_shard () {
     m_die_range_map = new parent_map;
     m_deferred_entries = new std::vector<deferred_entry>;
+    m_die_range_map_valid = new addrmap_mutable;
   }
 
   DISABLE_COPY_AND_ASSIGN (cooked_index_shard);
@@ -395,6 +396,18 @@ class cooked_index_shard
   const cooked_index_entry *resolve_deferred_entry
     (const deferred_entry &entry, const cooked_index_entry *parent_entry);
 
+  /* Mark parents in range [START, END] as valid .  */
+  void set_parent_valid (CORE_ADDR start, CORE_ADDR end)
+  {
+    m_die_range_map_valid->set_empty (start, end, (void *) 1);
+  }
+
+  /* Return true if find_parents can be relied upon.  */
+  bool parent_valid (CORE_ADDR addr)
+  {
+    return m_die_range_map_valid->find (addr) != nullptr;
+  }
+
 private:
 
   /* Return the entry that is believed to represent the program's
@@ -458,6 +471,8 @@ class cooked_index_shard
      understand this.  */
   parent_map *m_die_range_map;
 
+  addrmap *m_die_range_map_valid;
+
   /* The generated DWARF can sometimes have the declaration for a
      method in a class (or perhaps namespace) scope, with the
      definition appearing outside this scope... just one of the many
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index 87955d1d2e1..b5d9103e4b2 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -4689,6 +4689,12 @@ class cooked_index_storage
     m_index->defer_entry (de);
   }
 
+  /* Mark parents in range [START, END] as valid .  */
+  void set_parent_valid (CORE_ADDR start, CORE_ADDR end)
+  {
+    m_index->set_parent_valid (start, end);
+  }
+
 private:
 
   /* Hash function for a cutu_reader.  */
@@ -4838,6 +4844,11 @@ class cooked_indexer
   {
     m_index_storage->defer_entry (de);
   }
+
+  void set_parent_valid (CORE_ADDR start, CORE_ADDR end)
+  {
+    m_index_storage->set_parent_valid (start, end);
+  }
 };
 
 /* Subroutine of dwarf2_build_psymtabs_hard to simplify it.
@@ -16526,9 +16537,22 @@ cooked_indexer::index_dies (cutu_reader *reader,
 			     + to_underlying (reader->cu->header.sect_off)
 			     + reader->cu->header.get_length_with_initial ());
 
+  const CORE_ADDR start_cu
+    = form_addr (sect_offset (info_ptr - reader->buffer),
+		 reader->cu->per_cu->is_dwz,
+		 reader->cu->per_cu->is_debug_types);
+
   while (info_ptr < end_ptr)
     {
       sect_offset this_die = (sect_offset) (info_ptr - reader->buffer);
+
+      {
+	CORE_ADDR end_prev_die
+	  = form_addr (this_die - 1, reader->cu->per_cu->is_dwz,
+		       reader->cu->per_cu->is_debug_types);
+	set_parent_valid (start_cu, end_prev_die);
+      }
+
       unsigned int bytes_read;
       const abbrev_info *abbrev = peek_die_abbrev (*reader, info_ptr,
 						   &bytes_read);
@@ -16674,6 +16698,14 @@ cooked_indexer::index_dies (cutu_reader *reader,
 	}
     }
 
+  {
+    CORE_ADDR end_prev_die
+      = form_addr (sect_offset (info_ptr - reader->buffer - 1),
+		   reader->cu->per_cu->is_dwz,
+		   reader->cu->per_cu->is_debug_types);
+    set_parent_valid (start_cu, end_prev_die);
+  }
+
   return info_ptr;
 }
 
-- 
2.35.3