From: Tom Tromey <tom@tromey.com>
Date: Sun, 4 Jul 2021 19:33:12 +0000 (-0600)
Subject: Check for debug-types in map_symbol_filenames
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=15659f0a4ea0787d2c2194a4e3712a56ac3eff84;p=binutils-gdb.git

Check for debug-types in map_symbol_filenames

map_symbol_filenames can skip type units -- in fact I think it has to,
due to the assertion at the top of dw2_get_file_names.  This may be a
regression due to the TU/CU unification patch, I did not check.
---

diff --git a/gdb/dwarf2/read.c b/gdb/dwarf2/read.c
index c730c528a1e..90542599cb3 100644
--- a/gdb/dwarf2/read.c
+++ b/gdb/dwarf2/read.c
@@ -4420,7 +4420,8 @@ dwarf2_base_index_functions::map_symbol_filenames
 
   for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
     {
-      if (per_objfile->symtab_set_p (per_cu.get ()))
+      if (!per_cu->is_debug_types
+	  && per_objfile->symtab_set_p (per_cu.get ()))
 	{
 	  if (per_cu->v.quick->file_names != nullptr)
 	    qfn_cache.insert (per_cu->v.quick->file_names);
@@ -4430,7 +4431,8 @@ dwarf2_base_index_functions::map_symbol_filenames
   for (const auto &per_cu : per_objfile->per_bfd->all_comp_units)
     {
       /* We only need to look at symtabs not already expanded.  */
-      if (per_objfile->symtab_set_p (per_cu.get ()))
+      if (per_cu->is_debug_types
+	  || per_objfile->symtab_set_p (per_cu.get ()))
 	continue;
 
       quick_file_names *file_data = dw2_get_file_names (per_cu.get (),