averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Always mark the initial REPL file as typechecked

Browse Source 
We were previously doing this for the REPL, but
not for swift-ide-test. Move the assignment into
the frontend to make sure its always applied, and
inline `createREPLFile` while we're here.
This commit is contained in:
Hamish Knight
2020-02-03 21:01:45 -08:00
parent 8037f2feb0
commit e5946227da
3 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
lib/Frontend/Frontend.cpp
View File

@@ -727,7 +727,15 @@ void CompilerInstance::performSemaUpTo(SourceFile::ASTStage_t LimitStage) {
const ImplicitImports implicitImports(*this);
if (Invocation.getInputKind() == InputFileKind::SwiftREPL) {
createREPLFile(implicitImports);
// 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, implicitImports.kind, /*BufferID*/ None);
addAdditionalInitialImportsTo(replFile, implicitImports);
// Given this file is empty, we can go ahead and just mark it as having been
// type checked.
replFile->ASTStage = SourceFile::TypeChecked;
return;
}
@@ -824,12 +832,6 @@ void CompilerInstance::getImplicitlyImportedModules(
}
}
void CompilerInstance::createREPLFile(const ImplicitImports &implicitImports) {
auto *SingleInputFile = createSourceFileForMainModule(
Invocation.getSourceFileKind(), implicitImports.kind, None);
addAdditionalInitialImportsTo(SingleInputFile, implicitImports);
}
void CompilerInstance::addMainFileToModule(
const ImplicitImports &implicitImports) {
auto *MainFile = createSourceFileForMainModule(