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

This commit is contained in:
swift-ci
2018-03-30 17:29:07 -07:00
11 changed files with 155 additions and 68 deletions

View File

@@ -878,6 +878,12 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
// TypeResolver is set before.
ASTRef->Impl.TypeResolver = createLazyResolver(CompIns.getASTContext());
if (TracedOp.enabled()) {
SmallVector<DiagnosticEntryInfo, 8> Diagnostics;
Consumer.getAllDiagnostics(Diagnostics);
TracedOp.finish(Diagnostics);
}
return ASTRef;
}