diff --git a/tools/swift/Immediate.cpp b/tools/swift/Immediate.cpp index 7ffa970f8a6..ea009f29788 100644 --- a/tools/swift/Immediate.cpp +++ b/tools/swift/Immediate.cpp @@ -277,23 +277,22 @@ static bool IRGenImportedModules(TranslationUnit *TU, return hadError; } -void swift::RunImmediately(irgen::Options &Options, - TranslationUnit *TU, - const ProcessCmdLine &CmdLine, SILModule *SILMod) { - ASTContext &Context = TU->Ctx; +void swift::RunImmediately(CompilerInstance &CI, const ProcessCmdLine &CmdLine, + irgen::Options &Options) { + ASTContext &Context = CI.getASTContext(); // IRGen the main module. llvm::LLVMContext LLVMContext; - llvm::Module Module(TU->Name.str(), LLVMContext); - performIRGeneration(Options, &Module, TU, SILMod); + llvm::Module Module(CI.getTU()->Name.str(), LLVMContext); + performIRGeneration(Options, &Module, CI.getTU(), CI.getSILModule()); if (Context.hadError()) return; SmallVector InitFns; llvm::SmallPtrSet ImportedModules; - if (IRGenImportedModules(TU, Module, CmdLine, ImportedModules, InitFns, Options, - /*IsREPL*/false)) + if (IRGenImportedModules(CI.getTU(), Module, CmdLine, ImportedModules, + InitFns, Options, /*IsREPL*/false)) return; llvm::PassManagerBuilder PMBuilder; diff --git a/tools/swift/Immediate.h b/tools/swift/Immediate.h index c853babdf90..c7772bdde41 100644 --- a/tools/swift/Immediate.h +++ b/tools/swift/Immediate.h @@ -52,12 +52,9 @@ namespace swift { bool RanREPLApplicationMain; }; - void RunImmediately(irgen::Options &Options, - TranslationUnit *TU, - const ProcessCmdLine &CmdLine, - SILModule *SILMod = nullptr - ); - + void RunImmediately(CompilerInstance &CI, const ProcessCmdLine &CmdLine, + irgen::Options &Options); + void REPL(CompilerInstance &CI, const ProcessCmdLine &CmdLine); void REPLRunLoop(CompilerInstance &CI, const ProcessCmdLine &CmdLine); }