[Bug symtab/30672] [gdb/symtab] data race in cooked_index_shard::do_finalize() / cooked_index_entry::write_scope

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

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

Tom de Vries <vries at gcc dot gnu.org> changed:

           What    |Removed                     |Added
----------------------------------------------------------------------------
                 CC|                            |tromey at sourceware dot org

--- Comment #1 from Tom de Vries <vries at gcc dot gnu.org> ---
Tentative patch:
...
diff --git a/gdb/dwarf2/cooked-index.c b/gdb/dwarf2/cooked-index.c
index 25635d9b72e..8134f8dbbfc 100644
--- a/gdb/dwarf2/cooked-index.c
+++ b/gdb/dwarf2/cooked-index.c
@@ -68,6 +68,25 @@ language_requires_canonicalization (enum language lang)

 /* See cooked-index.h.  */

+cooked_index_entry::cooked_index_entry (sect_offset die_offset_,
+                                       enum dwarf_tag tag_,
+                                       cooked_index_flag flags_,
+                                       const char *name_,
+                                       const cooked_index_entry
*parent_entry_,

+                                       dwarf2_per_cu_data *per_cu_)
+  : name (name_),
+    tag (tag_),
+    flags (flags_),
+    die_offset (die_offset_),
+    parent_entry (parent_entry_),
+    per_cu (per_cu_)
+{
+  if (!language_requires_canonicalization (per_cu->lang ()))
+    canonical = name_;
+}
+
+/* See cooked-index.h.  */
+
 int
 cooked_index_entry::compare (const char *stra, const char *strb,
                             comparison_mode mode)
@@ -343,8 +362,9 @@ cooked_index_shard::do_finalize ()

   for (cooked_index_entry *entry : m_entries)
     {
-      /* Note that this code must be kept in sync with
-        language_requires_canonicalization.  */
+      if (!language_requires_canonicalization (entry->per_cu->lang ()))
+       continue;
+
       gdb_assert (entry->canonical == nullptr);
       if ((entry->flags & IS_LINKAGE) != 0)
        entry->canonical = entry->name;
@@ -388,7 +408,7 @@ cooked_index_shard::do_finalize ()
            }
        }
       else
-       entry->canonical = entry->name;
+       gdb_assert_not_reached ("Unhandled canonicalization");
     }--

   m_names.shrink_to_fit ();
diff --git a/gdb/dwarf2/cooked-index.h b/gdb/dwarf2/cooked-index.h
index 0d6f3e5aa0e..10207305109 100644
--- a/gdb/dwarf2/cooked-index.h
+++ b/gdb/dwarf2/cooked-index.h
@@ -78,15 +78,7 @@ struct cooked_index_entry : public allocate_on_obstack
   cooked_index_entry (sect_offset die_offset_, enum dwarf_tag tag_,
                      cooked_index_flag flags_, const char *name_,
                      const cooked_index_entry *parent_entry_,
-                     dwarf2_per_cu_data *per_cu_)
-    : name (name_),
-      tag (tag_),
-      flags (flags_),
-      die_offset (die_offset_),
-      parent_entry (parent_entry_),
-      per_cu (per_cu_)
-  {
-  }
+                     dwarf2_per_cu_data *per_cu_);

   /* Return true if this entry matches SEARCH_FLAGS.  */
   bool matches (block_search_flags search_flags) const
...

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