[Bug symtab/30718] [gdb/symtab] More index-cache data races

["vries at gcc dot gnu.org" <sourceware-bugzilla@sourceware.org>]

https://sourceware.org/bugzilla/show_bug.cgi?id=30718

--- Comment #1 from Tom de Vries <vries at gcc dot gnu.org> ---
Fixed by the usual:
...
diff --git a/gdb/dwarf2/read.h b/gdb/dwarf2/read.h
index 5f7d2dcd895..9dfc435e861 100644
--- a/gdb/dwarf2/read.h
+++ b/gdb/dwarf2/read.h
@@ -104,10 +104,10 @@ struct dwarf2_per_cu_data
       is_dwz (false),
       reading_dwo_directly (false),
       tu_read (false),
-      mark (false),
-      files_read (false),
       queued (false),
       m_header_read_in (false),
+      mark (false),
+      files_read (false),
       scanned (false)
   {
   }
@@ -150,14 +150,6 @@ struct dwarf2_per_cu_data
      This flag is only valid if is_debug_types is true.  */
   unsigned int tu_read : 1;

-  /* A temporary mark bit used when iterating over all CUs in
-     expand_symtabs_matching.  */
-  unsigned int mark : 1;
-
-  /* True if we've tried to read the file table.  There will be no
-     point in trying to read it again next time.  */
-  bool files_read : 1;
-
   /* Wrap the following in struct packed instead of bitfields to avoid
      data races when the bitfields end up on the same memory location
      (per C++ memory model).  */
@@ -176,6 +168,14 @@ struct dwarf2_per_cu_data
      it private at the moment.  */
   mutable packed<bool, 1> m_header_read_in;

+  /* A temporary mark bit used when iterating over all CUs in
+     expand_symtabs_matching.  */
+  packed<unsigned int, 1> mark;
+
+  /* True if we've tried to read the file table.  There will be no
+     point in trying to read it again next time.  */
+  packed<bool, 1> files_read;
+
 private:
   /* The unit type of this CU.  */
   std::atomic<packed<dwarf_unit_type, 1>> m_unit_type {(dwarf_unit_type)0};
...

-- 
You are receiving this mail because:
You are on the CC list for the bug.