Merge pull request swiftlang#31626 from hamishknight/read-evaluate-cleanup-loop

Author: hamishknight

include/swift/Frontend/InputFile.h

@@ -25,7 +25,6 @@ enum class InputFileKind {
   None,
   Swift,
   SwiftLibrary,
-  SwiftREPL,
   SwiftModuleInterface,
   SIL,
   LLVM

lib/Frontend/ArgsToFrontendOptionsConverter.cpp

@@ -405,8 +405,6 @@ bool ArgsToFrontendOptionsConverter::setUpInputKindAndImmediateArgs() {
     Opts.InputKind = InputFileKind::SwiftModuleInterface;
   else if (Args.hasArg(OPT_parse_as_library))
     Opts.InputKind = InputFileKind::SwiftLibrary;
-  else if (Opts.RequestedAction == FrontendOptions::ActionType::REPL)
-    Opts.InputKind = InputFileKind::SwiftREPL;
   else
     Opts.InputKind = InputFileKind::Swift;
 

lib/Frontend/CompilerInvocation.cpp

@@ -196,8 +196,6 @@ SourceFileKind CompilerInvocation::getSourceFileKind() const {
     return SourceFileKind::Main;
   case InputFileKind::SwiftLibrary:
     return SourceFileKind::Library;
-  case InputFileKind::SwiftREPL:
-    return SourceFileKind::Main;
   case InputFileKind::SwiftModuleInterface:
     return SourceFileKind::Interface;
   case InputFileKind::SIL:

lib/Frontend/Frontend.cpp

@@ -529,7 +529,6 @@ static bool shouldTreatSingleInputAsMain(InputFileKind inputKind) {
   case InputFileKind::SIL:
     return true;
   case InputFileKind::SwiftLibrary:
-  case InputFileKind::SwiftREPL:
   case InputFileKind::LLVM:
   case InputFileKind::None:
     return false;
@@ -779,15 +778,6 @@ void CompilerInstance::performSemaUpTo(SourceFile::ASTStage_t LimitStage) {
   // references, this can be removed.
   (void)MainModule->getImplicitImports();
 
-  if (Invocation.getInputKind() == InputFileKind::SwiftREPL) {
-    // Create the initial empty REPL file. This only exists to feed in the
-    // implicit imports such as the standard library.
-    auto *replFile =
-        createSourceFileForMainModule(SourceFileKind::Main, /*BufferID*/ None);
-    performImportResolution(*replFile);
-    return;
-  }
-
   // Make sure the main file is the first file in the module, so do this now.
   if (MainBufferID != NO_SUCH_BUFFER) {
     (void)createSourceFileForMainModule(Invocation.getSourceFileKind(),

lib/FrontendTool/TBD.cpp

@@ -66,7 +66,6 @@ bool swift::inputFileKindCanHaveTBDValidated(InputFileKind kind) {
     // FIXME: This would be a good test of the interface format.
     return false;
   case InputFileKind::None:
-  case InputFileKind::SwiftREPL:
   case InputFileKind::SIL:
   case InputFileKind::LLVM:
     return false;

tools/swift-ide-test/swift-ide-test.cpp

@@ -888,7 +888,7 @@ static int doREPLCodeCompletion(const CompilerInvocation &InitInvok,
     BufferText = BufferText.drop_back(1);
 
   CompilerInvocation Invocation(InitInvok);
-  Invocation.setInputKind(InputFileKind::SwiftREPL);
+  Invocation.setInputKind(InputFileKind::Swift);
 
   CompilerInstance CI;
 
@@ -897,13 +897,21 @@ static int doREPLCodeCompletion(const CompilerInvocation &InitInvok,
   CI.addDiagnosticConsumer(&PrintDiags);
   if (CI.setup(Invocation))
     return 1;
-  registerIDERequestFunctions(CI.getASTContext().evaluator);
-  CI.performSema();
-
-  SourceFile &SF = CI.getMainModule()->getMainSourceFile(SourceFileKind::Main);
+  auto &ctx = CI.getASTContext();
+  registerIDERequestFunctions(ctx.evaluator);
+
+  // Create an initial empty SourceFile. This only exists to feed in the
+  // implicit stdlib import.
+  ImplicitImportInfo importInfo;
+  importInfo.StdlibKind = ImplicitStdlibKind::Stdlib;
+  auto *M = ModuleDecl::create(ctx.getIdentifier(Invocation.getModuleName()),
+                               ctx, importInfo);
+  auto *SF = new (ctx) SourceFile(*M, SourceFileKind::Main, /*BufferID*/ None);
+  M->addFile(*SF);
+  performImportResolution(*SF);
 
   REPLCompletions REPLCompl;
-  REPLCompl.populate(SF, BufferText);
+  REPLCompl.populate(*SF, BufferText);
   llvm::outs() << "Begin completions\n";
   for (StringRef S : REPLCompl.getCompletionList()) {
     llvm::outs() << S << "\n";