Merge remote-tracking branch 'origin/master' into master-next

This commit is contained in:
swift-ci
2018-08-01 08:49:46 -07:00
6 changed files with 48 additions and 10 deletions

View File

@@ -998,7 +998,7 @@ static bool performCompile(CompilerInstance &Instance,
if (writeTBDIfNeeded(Invocation, Instance))
return true;
assert(Action >= FrontendOptions::ActionType::EmitSILGen &&
assert(FrontendOptions::doesActionGenerateSIL(Action) &&
"All actions not requiring SILGen must have been handled!");
std::deque<PostSILGenInputs> PSGIs = generateSILModules(Invocation, Instance);