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
2019-09-22 19:30:00 -07:00
parent 8d19ed93b3 c25de6af75
commit abcec82ca5
13 changed files with 488 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/FrontendTool/FrontendTool.cpp
View File

@@ -749,13 +749,16 @@ static void dumpAndPrintScopeMap(CompilerInvocation &Invocation,
if (Invocation.getFrontendOptions().DumpScopeMapLocations.empty()) {
llvm::errs() << "***Complete scope map***\n";
scope.buildFullyExpandedTree();
scope.print(llvm::errs());
return;
}
// Probe each of the locations, and dump what we find.
for (auto lineColumn :
Invocation.getFrontendOptions().DumpScopeMapLocations)
Invocation.getFrontendOptions().DumpScopeMapLocations) {
scope.buildFullyExpandedTree();
scope.dumpOneScopeMapLocation(lineColumn);
}
}
static SourceFile *getPrimaryOrMainSourceFile(CompilerInvocation &Invocation,