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

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

Browse Source
This commit is contained in:
swift-ci
2018-03-29 16:49:12 -07:00
parent 7536a8559c fcd86e3246
commit a597ade11b
25 changed files with 436 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
tools/SourceKit/lib/SwiftLang/SwiftASTManager.cpp
View File

@@ -792,9 +792,9 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
for (auto &Content : Contents)
Stamps.push_back(Content.Stamp);
trace::TracedOperation TracedOp(trace::OperationKind::PerformSema);
trace::SwiftInvocation TraceInfo;
if (trace::enabled()) {
if (TracedOp.enabled()) {
TraceInfo.Args.PrimaryFile = InvokRef->Impl.Opts.PrimaryFile;
TraceInfo.Args.Args = InvokRef->Impl.Opts.Args;
}
@@ -804,7 +804,7 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
if (Content.Snapshot)
ASTRef->Impl.Snapshots.push_back(Content.Snapshot);
if (trace::enabled()) {
if (TracedOp.enabled()) {
TraceInfo.addFile(Content.Buffer->getBufferIdentifier(),
Content.Buffer->getBuffer());
}
@@ -828,9 +828,8 @@ ASTUnitRef ASTProducer::createASTUnit(SwiftASTManager::Implementation &MgrImpl,
return nullptr;
}
trace::TracedOperation TracedOp;
if (trace::enabled()) {
TracedOp.start(trace::OperationKind::PerformSema, TraceInfo);
if (TracedOp.enabled()) {
TracedOp.start(TraceInfo);
}
CloseClangModuleFiles scopedCloseFiles(