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

Revert "Merge pull request #12952 from davidungar/move-in-to-next"

Browse Source 
This reverts commit 911140c7e1, reversing
changes made to 5590a2ff91.

This broke the incremental bot.

rdar://35746584
This commit is contained in:
Arnold Schwaighofer
2017-11-29 07:32:02 -08:00
parent a3b1308c76
commit 1a0443040e
9 changed files with 634 additions and 880 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(
@@ -777,7 +777,7 @@ static bool performCompile(CompilerInstance &Instance,
auto SASTF = dyn_cast<SerializedASTFile>(File);
return SASTF && SASTF->isSIB();
};
if (opts.Inputs.hasAPrimaryInputFile()) {
if (opts.Inputs.haveAPrimaryInputFile()) {
FileUnit *PrimaryFile = PrimarySourceFile;
if (!PrimaryFile) {
auto Index = opts.Inputs.getRequiredUniquePrimaryInput().Index;