Switch to filespeclist

Author: Jlalond

lldb/include/lldb/API/SBFileSpecList.h

@@ -40,6 +40,9 @@ class LLDB_API SBFileSpecList {
 
 private:
   friend class SBTarget;
+  friend class SBModule;
+
+  SBFileSpecList(lldb_private::FileSpecList &&list);
 
   const lldb_private::FileSpecList *operator->() const;
 

lldb/include/lldb/Core/Module.h

@@ -483,7 +483,7 @@ class Module : public std::enable_shared_from_this<Module>,
 
   const FileSpec &GetSymbolFileFileSpec() const { return m_symfile_spec; }
 
-  const llvm::StringMap<FileSpec> GetSeparateDebugInfoFiles();
+  FileSpecList GetSeparateDebugInfoFiles();
 
   void PreloadSymbols();
 

lldb/include/lldb/Symbol/SymbolFile.h

@@ -504,11 +504,8 @@ class SymbolFile : public PluginInterface {
   /// always return a valid list, even if it is empty.
   ///
   /// \return
-  ///     A unique map of all the filespecs, dwos in a dwps would be joined to
-  ///     the dwp path for example.
-  virtual llvm::StringMap<lldb_private::FileSpec> GetSeparateDebugInfoFiles() {
-    return {};
-  }
+  ///     A unique list of all the filespecs, or an empty list.
+  virtual lldb_private::FileSpecList GetSeparateDebugInfoFiles() { return {}; }
 
   virtual lldb::TypeSP
   MakeType(lldb::user_id_t uid, ConstString name,

lldb/include/lldb/Symbol/SymbolFileOnDemand.h

@@ -229,6 +229,10 @@ class SymbolFileOnDemand : public lldb_private::SymbolFile {
                                                  load_all_debug_info);
   }
 
+  lldb_private::FileSpecList GetSeparateDebugInfoFiles() override {
+    return m_sym_file_impl->GetSeparateDebugInfoFiles();
+  }
+
   lldb::TypeSP MakeType(lldb::user_id_t uid, ConstString name,
                         std::optional<uint64_t> byte_size,
                         SymbolContextScope *context,

lldb/source/API/SBFileSpecList.cpp

@@ -31,6 +31,11 @@ SBFileSpecList::SBFileSpecList(const SBFileSpecList &rhs) {
   m_opaque_up = clone(rhs.m_opaque_up);
 }
 
+SBFileSpecList::SBFileSpecList(FileSpecList &&list)
+    : m_opaque_up(new FileSpecList(std::move(list))) {
+  LLDB_INSTRUMENT_VA(this);
+}
+
 SBFileSpecList::~SBFileSpecList() = default;
 
 const SBFileSpecList &SBFileSpecList::operator=(const SBFileSpecList &rhs) {

lldb/source/API/SBModule.cpp

@@ -634,17 +634,11 @@ lldb::SBFileSpec SBModule::GetSymbolFileSpec() const {
 }
 
 lldb::SBFileSpecList SBModule::GetSeparateDebugInfoFiles() {
-  lldb::SBFileSpecList sb_filespeclist;
   ModuleSP module_sp(GetSP());
-  if (module_sp) {
-    llvm::StringMap<lldb_private::FileSpec> debug_info_files =
-        module_sp->GetSeparateDebugInfoFiles();
-    for (auto &&[_, debug_info_file] : debug_info_files) {
-      sb_filespeclist.Append(debug_info_file);
-    }
-  }
+  if (module_sp)
+    return lldb::SBFileSpecList(module_sp->GetSeparateDebugInfoFiles());
 
-  return sb_filespeclist;
+  return lldb::SBFileSpecList();
 }
 
 lldb::SBAddress SBModule::GetObjectFileHeaderAddress() const {

lldb/source/Core/Module.cpp

@@ -1648,8 +1648,7 @@ DataFileCache *Module::GetIndexCache() {
   return g_data_file_cache;
 }
 
-const llvm::StringMap<lldb_private::FileSpec>
-Module::GetSeparateDebugInfoFiles() {
+lldb_private::FileSpecList Module::GetSeparateDebugInfoFiles() {
   SymbolFile *symfile = GetSymbolFile(false);
   if (!symfile)
     return {};

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp

@@ -4215,11 +4215,10 @@ void SymbolFileDWARF::DumpClangAST(Stream &s, llvm::StringRef filter) {
   clang->Dump(s.AsRawOstream(), filter);
 }
 
-llvm::StringMap<lldb_private::FileSpec>
-SymbolFileDWARF::GetSeparateDebugInfoFiles() {
+lldb_private::FileSpecList SymbolFileDWARF::GetSeparateDebugInfoFiles() {
   DWARFDebugInfo &info = DebugInfo();
   const size_t num_cus = info.GetNumUnits();
-  llvm::StringMap<lldb_private::FileSpec> symbolfile_map;
+  lldb_private::FileSpecList spec_list;
   for (uint32_t cu_idx = 0; cu_idx < num_cus; ++cu_idx) {
     DWARFUnit *unit = info.GetUnitAtIndex(cu_idx);
     DWARFCompileUnit *dwarf_cu = llvm::dyn_cast<DWARFCompileUnit>(unit);
@@ -4235,10 +4234,9 @@ SymbolFileDWARF::GetSeparateDebugInfoFiles() {
 
     lldb_private::FileSpec symfile_spec =
         dwo_symfile->GetObjectFile()->GetFileSpec();
-    if (symbolfile_map.find(symfile_spec.GetPath()) == symbolfile_map.end())
-      symbolfile_map[symfile_spec.GetPath()] = symfile_spec;
+    spec_list.AppendIfUnique(symfile_spec);
   }
-  return symbolfile_map;
+  return spec_list;
 }
 
 bool SymbolFileDWARF::GetSeparateDebugInfo(StructuredData::Dictionary &d,

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.h

@@ -279,7 +279,7 @@ class SymbolFileDWARF : public SymbolFileCommon {
 
   void DumpClangAST(Stream &s, llvm::StringRef filter) override;
 
-  llvm::StringMap<lldb_private::FileSpec> GetSeparateDebugInfoFiles() override;
+  lldb_private::FileSpecList GetSeparateDebugInfoFiles() override;
 
   /// List separate dwo files.
   bool GetSeparateDebugInfo(StructuredData::Dictionary &d, bool errors_only,

lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARFDebugMap.cpp

@@ -1277,19 +1277,18 @@ void SymbolFileDWARFDebugMap::DumpClangAST(Stream &s, llvm::StringRef filter) {
   });
 }
 
-llvm::StringMap<lldb_private::FileSpec>
+lldb_private::FileSpecList
 SymbolFileDWARFDebugMap::GetSeparateDebugInfoFiles() {
   const uint32_t cu_count = GetNumCompileUnits();
-  llvm::StringMap<lldb_private::FileSpec> cu_map;
+  lldb_private::FileSpecList spec_list;
   for (uint32_t cu_idx = 0; cu_idx < cu_count; ++cu_idx) {
     const auto &info = m_compile_unit_infos[cu_idx];
     if (info.so_file.GetPath().empty())
       continue;
 
-    if (cu_map.find(info.oso_path) == cu_map.end())
-      cu_map[info.oso_path] = lldb_private::FileSpec(info.oso_path);
+    spec_list.AppendIfUnique(lldb_private::FileSpec(info.oso_path));
   }
-  return cu_map;
+  return spec_list;
 }
 
 bool SymbolFileDWARFDebugMap::GetSeparateDebugInfo(