Keep using parser lookup till we try to disable it

David Ungar · David Ungar · commit a127d78826c7 · 2019-09-13T22:30:49.000-07:00
diff --git a/lib/Parse/ASTGen.cpp b/lib/Parse/ASTGen.cpp
@@ -550,7 +550,7 @@ MagicIdentifierLiteralExpr::Kind ASTGen::getMagicIdentifierLiteralKind(tok Kind)
 }
 
 ValueDecl *ASTGen::lookupInScope(DeclName Name) {
-  return Context.LangOpts.EnableASTScopeLookup
+  return Context.LangOpts.EnableASTScopeLookup && Context.LangOpts.DisableParserLookup
              ? nullptr
              : (*ParserState)->getScopeInfo().lookupValueName(Name);
 }

Original file line number	Diff line number	Diff line change
`@@ -550,7 +550,7 @@ MagicIdentifierLiteralExpr::Kind ASTGen::getMagicIdentifierLiteralKind(tok Kind)`
`550`	`550`	`}`
`551`	`551`
`552`	`552`	`ValueDecl *ASTGen::lookupInScope(DeclName Name) {`
`553`		`- return Context.LangOpts.EnableASTScopeLookup`
	`553`	`+ return Context.LangOpts.EnableASTScopeLookup && Context.LangOpts.DisableParserLookup`
`554`	`554`	`? nullptr`
`555`	`555`	`: (*ParserState)->getScopeInfo().lookupValueName(Name);`
`556`	`556`	`}`