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

Address Jordan’s comments:

Browse Source 
- Also be consistent about has vs have for Input predicates

Fix bug.
This commit is contained in:
David Ungar
2017-11-18 11:55:58 -08:00
parent 07dfa263cd
commit 26537ea26c
9 changed files with 76 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/FrontendTool/FrontendTool.cpp
View File

@@ -542,7 +542,7 @@ static bool performCompile(CompilerInstance &Instance,
auto &LLVMContext = getGlobalLLVMContext();
// Load in bitcode file.
assert(Invocation.getFrontendOptions().Inputs.hasUniqueInputFilename() &&
assert(Invocation.getFrontendOptions().Inputs.haveUniqueInputFilename() &&
"We expect a single input for bitcode input!");
llvm::ErrorOr<std::unique_ptr<llvm::MemoryBuffer>> FileBufOrErr =
llvm::MemoryBuffer::getFileOrSTDIN(
@@ -780,7 +780,7 @@ static bool performCompile(CompilerInstance &Instance,
if (opts.Inputs.haveAPrimaryInputFile()) {
FileUnit *PrimaryFile = PrimarySourceFile;
if (!PrimaryFile) {
auto Index = opts.Inputs.getOptionalPrimaryInput()->Index;
auto Index = opts.Inputs.getRequiredUniquePrimaryInput().Index;
PrimaryFile = Instance.getMainModule()->getFiles()[Index];
}
astGuaranteedToCorrespondToSIL = !fileIsSIB(PrimaryFile);