Merge pull request #9618 from hamishknight/lets-try-this-again

[lldb] Update for removal of `ModuleDecl::addFile`

Author: hamishknight

lldb/source/Plugins/ExpressionParser/Swift/SwiftExpressionParser.cpp

@@ -1296,19 +1296,21 @@ SwiftExpressionParser::ParseAndImport(
       return make_error<SwiftASTContextError>();
 
     auto module_id = ast_context->getIdentifier(expr_name_buf);
-    module = swift::ModuleDecl::create(module_id, **ast_context, importInfo);
-
-    swift::SourceFileKind source_file_kind = swift::SourceFileKind::Library;
-    if (playground || repl) {
-      source_file_kind = swift::SourceFileKind::Main;
-    }
+    module = swift::ModuleDecl::create(
+        module_id, **ast_context, importInfo,
+        [&](swift::ModuleDecl *module, auto addFile) {
+      swift::SourceFileKind source_file_kind = swift::SourceFileKind::Library;
+      if (playground || repl) {
+        source_file_kind = swift::SourceFileKind::Main;
+      }
 
-    // Create the source file. Note, we disable delayed parsing for the
-    // swift expression parser.
-    source_file = new (**ast_context) swift::SourceFile(
-        *module, source_file_kind, buffer_id,
-        swift::SourceFile::ParsingFlags::DisableDelayedBodies);
-    module->addFile(*source_file);
+      // Create the source file. Note, we disable delayed parsing for the
+      // swift expression parser.
+      source_file = new (**ast_context) swift::SourceFile(
+          *module, source_file_kind, buffer_id,
+          swift::SourceFile::ParsingFlags::DisableDelayedBodies);
+      addFile(source_file);
+    });
   }
   // Swift Modules that rely on shared libraries (not frameworks)
   // don't record the link information in the swiftmodule file, so we

lldb/source/Plugins/ExpressionParser/Swift/SwiftREPL.cpp

@@ -614,18 +614,22 @@ void SwiftREPL::CompleteCode(const std::string &current_code,
   if (!repl_module) {
     swift::ImplicitImportInfo importInfo;
     importInfo.StdlibKind = swift::ImplicitStdlibKind::Stdlib;
+
     auto repl_module_or_err = swift_ast->CreateModule(
-        completion_module_info.path.back().GetString(), importInfo);
+        completion_module_info.path.back().GetString(), importInfo,
+        [&](swift::ModuleDecl *repl_module, auto addFile) {
+      auto bufferID = (*ast)->SourceMgr.addMemBufferCopy("// swift repl\n");
+      swift::SourceFile *repl_source_file = new (**ast) swift::SourceFile(
+          *repl_module, swift::SourceFileKind::Main, bufferID);
+      addFile(repl_source_file);
+    });
     if (!repl_module_or_err) {
       llvm::consumeError(repl_module_or_err.takeError());
       return;
     }
     repl_module = &*repl_module_or_err;
-    auto bufferID = (*ast)->SourceMgr.addMemBufferCopy("// swift repl\n");
-    swift::SourceFile *repl_source_file = new (**ast)
-        swift::SourceFile(*repl_module, swift::SourceFileKind::Main, bufferID);
-    repl_module->addFile(*repl_source_file);
-    swift::performImportResolution(*repl_source_file);
+
+    swift::performImportResolution(repl_module);
     m_completion_module_initialized = true;
   }
   if (repl_module) {

lldb/source/Plugins/LanguageRuntime/Swift/SwiftLanguageRuntime.cpp

@@ -1458,8 +1458,7 @@ void SwiftLanguageRuntime::RegisterGlobalError(Target &target, ConstString name,
   module_info.path.push_back(ConstString(module_name));
 
   swift::ModuleDecl *module_decl = nullptr;
-  auto module_decl_or_err = swift_ast_ctx->CreateModule(module_name,
-                                                        /*importInfo*/ {});
+  auto module_decl_or_err = swift_ast_ctx->CreateEmptyModule(module_name);
   if (!module_decl_or_err)
     llvm::consumeError(module_decl_or_err.takeError());
   else

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.cpp

@@ -3825,8 +3825,14 @@ swift::ModuleDecl *SwiftASTContext::GetCachedModule(std::string module_name) {
 }
 
 llvm::Expected<swift::ModuleDecl &>
-SwiftASTContext::CreateModule(std::string module_name,
-                              swift::ImplicitImportInfo importInfo) {
+SwiftASTContext::CreateEmptyModule(std::string module_name) {
+  return CreateModule(module_name, /*importInfo*/ {},
+                      /*populateFiles*/ [](auto, auto) {});
+}
+
+llvm::Expected<swift::ModuleDecl &> SwiftASTContext::CreateModule(
+    std::string module_name, swift::ImplicitImportInfo importInfo,
+    swift::ModuleDecl::PopulateFilesFn populateFiles) {
   VALID_OR_RETURN(llvm::createStringError("no context"));
   if (module_name.empty())
     return llvm::createStringError("invalid module name (empty)");
@@ -3840,7 +3846,8 @@ SwiftASTContext::CreateModule(std::string module_name,
     return llvm::createStringError("invalid swift AST (nullptr)");
 
   swift::Identifier module_id(ast->getIdentifier(module_name));
-  auto *module_decl = swift::ModuleDecl::create(module_id, **ast, importInfo);
+  auto *module_decl =
+      swift::ModuleDecl::create(module_id, **ast, importInfo, populateFiles);
   if (!module_decl)
     return llvm::createStringError(
         llvm::formatv("failed to create module for \"{0}\"", module_name));
@@ -5120,9 +5127,8 @@ swift::ModuleDecl *SwiftASTContext::GetScratchModule() {
 
   if (m_scratch_module == nullptr) {
     ThreadSafeASTContext ast_ctx = GetASTContext();
-    m_scratch_module = swift::ModuleDecl::create(
-        GetASTContext()->getIdentifier("__lldb_scratch_module"),
-        **ast_ctx);
+    m_scratch_module = swift::ModuleDecl::createEmpty(
+        GetASTContext()->getIdentifier("__lldb_scratch_module"), **ast_ctx);
   }
   return m_scratch_module;
 }

lldb/source/Plugins/TypeSystem/Swift/SwiftASTContext.h

@@ -309,12 +309,19 @@ class SwiftASTContext : public TypeSystemSwift {
   /// \return the ExtraArgs of the ClangImporterOptions.
   const std::vector<std::string> &GetClangArguments();
 
+  /// Attempt to create an empty Swift module.
+  llvm::Expected<swift::ModuleDecl &>
+  CreateEmptyModule(std::string module_name);
+
   /// Attempt to create a Swift module.
   ///
   /// \param importInfo Information about which modules should be implicitly
   /// imported by each file of the module.
+  /// \param populateFiles A function which populates the files for the module.
+  /// Once called, the module's list of files may not change.
   llvm::Expected<swift::ModuleDecl &>
-  CreateModule(std::string module_name, swift::ImplicitImportInfo importInfo);
+  CreateModule(std::string module_name, swift::ImplicitImportInfo importInfo,
+               swift::ModuleDecl::PopulateFilesFn populateFiles);
 
   // This function should only be called when all search paths
   // for all items in a swift::ASTContext have been setup to