swiftlang · slavapestov · May 7, 2020 · May 7, 2020 · May 7, 2020 · May 7, 2020
diff --git a/include/swift/AST/IRGenOptions.h b/include/swift/AST/IRGenOptions.h
@@ -181,9 +181,6 @@ class IRGenOptions {
   /// Whether we're generating IR for the JIT.
   unsigned UseJIT : 1;
 
-  /// Whether we're generating code for the integrated REPL.
-  unsigned IntegratedREPL : 1;
-
   /// Whether we should run LLVM optimizations after IRGen.
   unsigned DisableLLVMOptzns : 1;
 
@@ -320,7 +317,7 @@ class IRGenOptions {
         DebugInfoLevel(IRGenDebugInfoLevel::None),
         DebugInfoFormat(IRGenDebugInfoFormat::None),
         DisableClangModuleSkeletonCUs(false), UseJIT(false),
-        IntegratedREPL(false), DisableLLVMOptzns(false),
+        DisableLLVMOptzns(false),
         DisableSwiftSpecificLLVMOptzns(false), DisableLLVMSLPVectorizer(false),
         DisableFPElim(true), Playground(false), EmitStackPromotionChecks(false),
         FunctionSections(false), PrintInlineTree(false), EmbedMode(IRGenEmbedMode::None),

diff --git a/include/swift/AST/Module.h b/include/swift/AST/Module.h
@@ -107,7 +107,6 @@ enum class FileUnitKind {
 enum class SourceFileKind {
   Library,  ///< A normal .swift file.
   Main,     ///< A .swift file that can have top-level code.
-  REPL,     ///< A virtual file that holds the user's input in the REPL.
   SIL,      ///< Came from a .sil file.
   Interface ///< Came from a .swiftinterface file, representing another module.
 };

diff --git a/include/swift/AST/SourceFile.h b/include/swift/AST/SourceFile.h
@@ -172,7 +172,7 @@ class SourceFile final : public FileUnit {
 
   /// The list of top-level declarations in the source file. This is \c None if
   /// they have not yet been parsed.
-  /// FIXME: Once addTopLevelDecl/prependTopLevelDecl/truncateTopLevelDecls
+  /// FIXME: Once addTopLevelDecl/prependTopLevelDecl
   /// have been removed, this can become an optional ArrayRef.
   Optional<std::vector<Decl *>> Decls;
 
@@ -232,15 +232,6 @@ class SourceFile final : public FileUnit {
     return llvm::makeArrayRef(*Decls);
   }
 
-  /// Truncates the list of top-level decls so it contains \c count elements. Do
-  /// not add any additional uses of this function.
-  void truncateTopLevelDecls(unsigned count) {
-    // Force decl parsing if we haven't already.
-    (void)getTopLevelDecls();
-    assert(count <= Decls->size() && "Can only truncate top-level decls!");
-    Decls->resize(count);
-  }
-
   /// Retrieve the parsing options for the file.
   ParsingOptions getParsingOptions() const { return ParsingOpts; }
 
@@ -524,7 +515,6 @@ class SourceFile final : public FileUnit {
   bool isScriptMode() const {
     switch (Kind) {
     case SourceFileKind::Main:
-    case SourceFileKind::REPL:
       return true;
 
     case SourceFileKind::Library:

diff --git a/include/swift/Immediate/Immediate.h b/include/swift/Immediate/Immediate.h
@@ -41,9 +41,6 @@ namespace swift {
   int RunImmediately(CompilerInstance &CI, const ProcessCmdLine &CmdLine,
                      const IRGenOptions &IRGenOpts, const SILOptions &SILOpts,
                      std::unique_ptr<SILModule> &&SM);
-
-  void runREPL(CompilerInstance &CI, const ProcessCmdLine &CmdLine,
-               bool ParseStdlib);
 } // end namespace swift
 
 #endif // SWIFT_IMMEDIATE_IMMEDIATE_H
diff --git a/lib/AST/ASTVerifier.cpp b/lib/AST/ASTVerifier.cpp
@@ -1196,9 +1196,7 @@ class Verifier : public ASTWalker {
       // it should be parented by the innermost function.
       auto enclosingScope = Scopes[Scopes.size() - 2];
       auto enclosingDC = enclosingScope.dyn_cast<DeclContext*>();
-      if (enclosingDC && !isa<AbstractClosureExpr>(enclosingDC)
-          && !(isa<SourceFile>(enclosingDC)
-               && cast<SourceFile>(enclosingDC)->Kind == SourceFileKind::REPL)){
+      if (enclosingDC && !isa<AbstractClosureExpr>(enclosingDC)){
         auto parentDC = E->getParent();
         if (!isa<Initializer>(parentDC)) {
           Out << "a closure in non-local context should be parented "

diff --git a/lib/AST/Module.cpp b/lib/AST/Module.cpp
@@ -1686,12 +1686,6 @@ SourceFile::collectLinkLibraries(ModuleDecl::LinkLibraryCallback callback) const
       continue;
 
     if (next->getName() != getParentModule()->getName()) {
-      // Hack: Assume other REPL files already have their libraries linked.
-      if (!next->getFiles().empty())
-        if (auto *nextSource = dyn_cast<SourceFile>(next->getFiles().front()))
-          if (nextSource->Kind == SourceFileKind::REPL)
-            continue;
-
       next->collectLinkLibraries(callback);
     }
 
@@ -2461,7 +2455,6 @@ bool SourceFile::shouldCollectToken() const {
   case SourceFileKind::Main:
   case SourceFileKind::Interface:
     return (bool)AllCorrectedTokens;
-  case SourceFileKind::REPL:
   case SourceFileKind::SIL:
     return false;
   }
@@ -2478,7 +2471,6 @@ bool SourceFile::canBeParsedInFull() const {
   case SourceFileKind::Main:
   case SourceFileKind::Interface:
     return true;
-  case SourceFileKind::REPL:
   case SourceFileKind::SIL:
     return false;
   }
@@ -2490,7 +2482,7 @@ bool SourceFile::hasDelayedBodyParsing() const {
     return false;
 
   // Not supported right now.
-  if (Kind == SourceFileKind::REPL || Kind == SourceFileKind::SIL)
+  if (Kind == SourceFileKind::SIL)
     return false;
   if (hasInterfaceHash())
     return false;

diff --git a/lib/AST/TypeCheckRequests.cpp b/lib/AST/TypeCheckRequests.cpp
@@ -1468,7 +1468,6 @@ void TypeCheckSourceFileRequest::cacheResult(evaluator::SideEffect) const {
     // skip verification and avoid caching it.
 #ifndef NDEBUG
     if (!Ctx.TypeCheckerOpts.DelayWholeModuleChecking &&
-        SF->Kind != SourceFileKind::REPL &&
         SF->Kind != SourceFileKind::SIL &&
         !Ctx.LangOpts.DebuggerSupport) {
       Ctx.verifyAllLoadedModules();

diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp
@@ -197,7 +197,7 @@ SourceFileKind CompilerInvocation::getSourceFileKind() const {
   case InputFileKind::SwiftLibrary:
     return SourceFileKind::Library;
   case InputFileKind::SwiftREPL:
-    return SourceFileKind::REPL;
+    return SourceFileKind::Main;
   case InputFileKind::SwiftModuleInterface:
     return SourceFileKind::Interface;
   case InputFileKind::SIL:

diff --git a/lib/Frontend/Frontend.cpp b/lib/Frontend/Frontend.cpp
@@ -783,7 +783,7 @@ void CompilerInstance::performSemaUpTo(SourceFile::ASTStage_t LimitStage) {
     // Create the initial empty REPL file. This only exists to feed in the
     // implicit imports such as the standard library.
     auto *replFile =
-        createSourceFileForMainModule(SourceFileKind::REPL, /*BufferID*/ None);
+        createSourceFileForMainModule(SourceFileKind::Main, /*BufferID*/ None);
     performImportResolution(*replFile);
     return;
   }

diff --git a/lib/FrontendTool/FrontendTool.cpp b/lib/FrontendTool/FrontendTool.cpp
@@ -1278,9 +1278,8 @@ static bool performCompile(CompilerInstance &Instance,
   (void)migrator::updateCodeAndEmitRemapIfNeeded(&Instance);
 
   if (Action == FrontendOptions::ActionType::REPL) {
-    runREPL(Instance, ProcessCmdLine(Args.begin(), Args.end()),
-            Invocation.getParseStdlib());
-    return Context.hadError();
+    llvm::report_fatal_error("Compiler-internal integrated REPL has been "
+                             "removed; use the LLDB-enhanced REPL instead.");
   }
 
   if (auto r = dumpASTIfNeeded(Instance))

diff --git a/lib/IDE/REPLCodeCompletion.cpp b/lib/IDE/REPLCodeCompletion.cpp
@@ -235,7 +235,7 @@ doCodeCompletion(SourceFile &SF, StringRef EnteredCode, unsigned *BufferID,
   auto *newModule = ModuleDecl::create(
       Ctx.getIdentifier("REPL_Code_Completion"), Ctx, implicitImports);
   auto &newSF =
-      *new (Ctx) SourceFile(*newModule, SourceFileKind::REPL, *BufferID);
+      *new (Ctx) SourceFile(*newModule, SourceFileKind::Main, *BufferID);
   newModule->addFile(newSF);
 
   performImportResolution(newSF);
@@ -256,8 +256,6 @@ void REPLCompletions::populate(SourceFile &SF, StringRef EnteredCode) {
   CompletionStrings.clear();
   CookedResults.clear();
 
-  assert(SF.Kind == SourceFileKind::REPL && "Can't append to a non-REPL file");
-
   unsigned BufferID;
   doCodeCompletion(SF, EnteredCode, &BufferID,
                    CompletionCallbacksFactory.get());

diff --git a/lib/IRGen/GenDecl.cpp b/lib/IRGen/GenDecl.cpp
@@ -3020,11 +3020,6 @@ IRGenModule::getAddrOfLLVMVariableOrGOTEquivalent(LinkEntity entity) {
       cast<llvm::GlobalValue>(entry), entity);
     return {gotEquivalent, ConstantReference::Indirect};
   };
-
-  // The integrated REPL incrementally adds new definitions, so always use
-  // indirect references in this mode.
-  if (IRGen.Opts.IntegratedREPL)
-    return indirect();
 
   // Dynamically replaceable function keys are stored in the GlobalVars
   // table, but they don't have an associated Decl, so they require

diff --git a/lib/Immediate/CMakeLists.txt b/lib/Immediate/CMakeLists.txt
@@ -1,6 +1,5 @@
 add_swift_host_library(swiftImmediate STATIC
   Immediate.cpp
-  REPL.cpp
   LLVM_LINK_COMPONENTS
     executionengine
     linker
@@ -14,9 +13,3 @@ target_link_libraries(swiftImmediate PRIVATE
   swiftIRGen
   swiftSILGen
   swiftSILOptimizer)
-if(LibEdit_FOUND AND LibEdit_HAS_UNICODE)
-  target_compile_definitions(swiftImmediate PRIVATE
-    HAVE_LIBEDIT)
-  target_link_libraries(swiftImmediate PRIVATE
-    libedit)
-endif()