Manual rebase with master

This commit is contained in:
David Ungar
2019-08-03 10:47:43 -07:00
parent 369e31e463
commit f64033a2d2
20 changed files with 1973 additions and 1188 deletions

View File

@@ -745,7 +745,8 @@ static void verifyGenericSignaturesIfNeeded(CompilerInvocation &Invocation,
static void dumpAndPrintScopeMap(CompilerInvocation &Invocation,
CompilerInstance &Instance, SourceFile *SF) {
const ASTScope &scope = SF->getScope();
// Not const because may require reexpansion
ASTScope &scope = SF->getScope();
if (Invocation.getFrontendOptions().DumpScopeMapLocations.empty()) {
llvm::errs() << "***Complete scope map***\n";