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

Merge pull request #12920 from davidungar/Move-input-conversion

Browse Source 
Move input conversion
This commit is contained in:
David Ungar
2017-11-27 17:13:48 -08:00
committed by GitHub
parent 7ae583fd93 0b39a883c2
commit 83ee8cb7f0
13 changed files with 283 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Frontend/Frontend.cpp
View File

@@ -157,7 +157,7 @@ bool CompilerInstance::setup(const CompilerInvocation &Invok) {
Invocation.getLangOptions().EnableAccessControl = false;
const Optional<SelectedInput> &PrimaryInput =
Invocation.getFrontendOptions().Inputs.getPrimaryInput();
Invocation.getFrontendOptions().Inputs.getOptionalPrimaryInput();
// Add the memory buffers first, these will be associated with a filename
// and they can replace the contents of an input filename.
@@ -187,7 +187,7 @@ bool CompilerInstance::setup(const CompilerInvocation &Invok) {
for (unsigned i = 0,
e = Invocation.getFrontendOptions().Inputs.inputFilenameCount();
i != e; ++i) {
bool hasError = setupForFileAt(i);
bool hasError = setUpForFileAt(i);
if (hasError) {
return true;
}
@@ -726,7 +726,7 @@ void CompilerInstance::freeContextAndSIL() {
PrimarySourceFile = nullptr;
}
bool CompilerInstance::setupForFileAt(unsigned i) {
bool CompilerInstance::setUpForFileAt(unsigned i) {
bool MainMode = (Invocation.getInputKind() == InputFileKind::IFK_Swift);
bool SILMode = (Invocation.getInputKind() == InputFileKind::IFK_SIL);