[Bug symtab/27981] [gdb/symtab] CU importing itself causes gdb to segfault

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

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

--- Comment #2 from Tom de Vries <vries at gcc dot gnu.org> ---
Ad-hoc fixes to make the test-case pass:
...
diff --git a/gdb/block.c b/gdb/block.c
index 26126f5b76f..94feeb0f87c 100644
--- a/gdb/block.c
+++ b/gdb/block.c
@@ -488,7 +488,7 @@ initialize_block_iterator (const struct block *block,

   /* If this is an included symtab, find the canonical includer and
      use it instead.  */
-  while (cu->user != NULL)
+  while (cu->user != NULL && cu->user != cu)
     cu = cu->user;

   /* Putting this check here simplifies the logic of the iterator
diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index a36f25f4e62..9859328c276 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -18258,6 +18258,9 @@ cooked_indexer::index_imported_unit (cutu_reader
*reader,
   dwarf2_per_objfile *per_objfile = reader->cu->per_objfile;
   cutu_reader *new_reader = ensure_cu_exists (reader, per_objfile, sect_off,
                                              is_dwz, true);
+  if (new_reader == reader)
+    return info_ptr;
+
   if (new_reader != nullptr)
     {
       index_dies (new_reader, new_reader->info_ptr, nullptr, false);
...

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