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

@@ -488,7 +488,7 @@ void UnqualifiedLookupFactory::performUnqualifiedLookup() {
static bool haveWarned = false;
if (!haveWarned) {
haveWarned = true;
llvm::errs() << "WARNING: TRYING Scope exclusively\n";
//xxx llvm::errs() << "WARNING: TRYING Scope exclusively\n";
}
experimentallyLookInASTScopes();
return;
@@ -1332,7 +1332,7 @@ bool UnqualifiedLookupFactory::verifyEqualTo(
e.getValueDecl()->print(as);
oe.getValueDecl()->print(bs);
if (a == b)
llvm::errs() << "ValueDecls differ but print same";
llvm::errs() << "ValueDecls differ but print same\n";
else {
writeErr(std::string( "ValueDecls differ at ") + std::to_string(i));
assert(false && "ASTScopeImpl found different Decl");