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
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -83,7 +83,7 @@ struct InvocationOptions {
// Assert invocation with a primary file. We want to avoid full typechecking
// for all files.
assert(!this->PrimaryFile.empty());
assert(this->Invok.getFrontendOptions().Inputs.hasUniquePrimaryInput() &&
assert(this->Invok.getFrontendOptions().Inputs.haveUniquePrimaryInput() &&
"Must have exactly one primary input for code completion, etc.");
}
@@ -355,7 +355,7 @@ static void setModuleName(CompilerInvocation &Invocation) {
StringRef Filename = Invocation.getOutputFilename();
if (Filename.empty()) {
if (!Invocation.getFrontendOptions().Inputs.hasInputFilenames()) {
if (!Invocation.getFrontendOptions().Inputs.haveInputFilenames()) {
Invocation.setModuleName("__main__");
return;
}