Move to sbmodulespec

Author: Jlalond

lldb/bindings/interface/SBFileSpecListExtensions.i

@@ -10,10 +10,6 @@ STRING_EXTENSION_OUTSIDE(SBFileSpecList)
     def __iter__(self):
       '''Iterate over all FileSpecs in a lldb.SBFileSpecList object.'''
       return lldb_iter(self, 'GetSize', 'GetFileSpecAtIndex')
-
-    def __getitem__(self, index):
-      '''Get an lldb.SBFileSpec at a given index, an invalid SBFileSpec will be returned if the index is invalid.'''
-      return self.GetFileSpecAtIndex(index)
     %}
 #endif
 }

lldb/bindings/interface/SBModuleSpecListExtensions.i

@@ -10,7 +10,10 @@ STRING_EXTENSION_OUTSIDE(SBModuleSpecList)
     def __iter__(self):
       '''Iterate over all ModuleSpecs in a lldb.SBModuleSpecList object.'''
       return lldb_iter(self, 'GetSize', 'GetSpecAtIndex')
+
+    def __getitem__(self, index):
+      '''Get an lldb.SBModuleSpec at a given index, an invalid SBModuleSpec will be returned if the index is invalid.'''
+      return self.GetSpecAtIndex(index) 
     %}
 #endif
 }
-

lldb/include/lldb/API/SBFileSpecList.h

@@ -40,9 +40,6 @@ 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/API/SBModule.h

@@ -293,7 +293,7 @@ class LLDB_API SBModule {
   /// \return
   ///     A list of filespecs associated with all the separate symbol files
   ///     associated with this module.
-  lldb::SBFileSpecList GetSeparateDebugInfoFiles();
+  lldb::SBModuleSpecList GetSeparateDebugInfoFiles();
 
   lldb::SBAddress GetObjectFileHeaderAddress() const;
   lldb::SBAddress GetObjectFileEntryPointAddress() const;

lldb/include/lldb/API/SBModuleSpec.h

@@ -125,6 +125,9 @@ class SBModuleSpecList {
   bool GetDescription(lldb::SBStream &description);
 
 private:
+  friend class SBModule;
+
+  SBModuleSpecList(lldb_private::ModuleSpecList &&module_spec_list);
   std::unique_ptr<lldb_private::ModuleSpecList> m_opaque_up;
 };
 

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; }
 
-  FileSpecList GetSeparateDebugInfoFiles();
+  ModuleSpecList GetSeparateDebugInfoFiles();
 
   void PreloadSymbols();
 

lldb/include/lldb/Symbol/SymbolFile.h

@@ -28,7 +28,6 @@
 #include "lldb/lldb-private.h"
 #include "llvm/ADT/DenseSet.h"
 #include "llvm/ADT/SmallSet.h"
-#include "llvm/ADT/StringMap.h"
 #include "llvm/Support/Errc.h"
 
 #include <mutex>
@@ -505,7 +504,9 @@ class SymbolFile : public PluginInterface {
   ///
   /// \return
   ///     A unique list of all the filespecs, or an empty list.
-  virtual lldb_private::FileSpecList GetSeparateDebugInfoFiles() { return {}; }
+  virtual lldb_private::ModuleSpecList GetSeparateDebugInfoFiles() {
+    return {};
+  }
 
   virtual lldb::TypeSP
   MakeType(lldb::user_id_t uid, ConstString name,

lldb/include/lldb/Symbol/SymbolFileOnDemand.h

@@ -229,7 +229,7 @@ class SymbolFileOnDemand : public lldb_private::SymbolFile {
                                                  load_all_debug_info);
   }
 
-  lldb_private::FileSpecList GetSeparateDebugInfoFiles() override {
+  lldb_private::ModuleSpecList GetSeparateDebugInfoFiles() override {
     return m_sym_file_impl->GetSeparateDebugInfoFiles();
   }
 

lldb/source/API/SBFileSpecList.cpp

@@ -31,11 +31,6 @@ 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

@@ -633,12 +633,12 @@ lldb::SBFileSpec SBModule::GetSymbolFileSpec() const {
   return sb_file_spec;
 }
 
-lldb::SBFileSpecList SBModule::GetSeparateDebugInfoFiles() {
+lldb::SBModuleSpecList SBModule::GetSeparateDebugInfoFiles() {
   ModuleSP module_sp(GetSP());
   if (module_sp)
-    return lldb::SBFileSpecList(module_sp->GetSeparateDebugInfoFiles());
+    return lldb::SBModuleSpecList(module_sp->GetSeparateDebugInfoFiles());
 
-  return lldb::SBFileSpecList();
+  return lldb::SBModuleSpecList();
 }
 
 lldb::SBAddress SBModule::GetObjectFileHeaderAddress() const {