Fix overly restrictive assertion, for -dump-scope-maps case

David Ungar · David Ungar · commit c7e603ddf7d3 · 2019-09-14T13:41:59.000-07:00
diff --git a/lib/AST/Module.cpp b/lib/AST/Module.cpp
@@ -1745,8 +1745,7 @@ StringRef SourceFile::getFilename() const {
 }
 
 ASTScope &SourceFile::getScope() {
-  assert(getASTContext().LangOpts.EnableASTScopeLookup &&
-         isSuitableForASTScopes() && "Should not be creating scope tree");
+  assert(isSuitableForASTScopes() && "Should not be creating scope tree");
   if (!Scope)
     Scope = std::unique_ptr<ASTScope>(new (getASTContext()) ASTScope(this));
   return *Scope.get();

Original file line number	Diff line number	Diff line change
`@@ -1745,8 +1745,7 @@ StringRef SourceFile::getFilename() const {`
`1745`	`1745`	`}`
`1746`	`1746`
`1747`	`1747`	`ASTScope &SourceFile::getScope() {`
`1748`		`- assert(getASTContext().LangOpts.EnableASTScopeLookup &&`
`1749`		`- isSuitableForASTScopes() && "Should not be creating scope tree");`
	`1748`	`+ assert(isSuitableForASTScopes() && "Should not be creating scope tree");`
`1750`	`1749`	`if (!Scope)`
`1751`	`1750`	`Scope = std::unique_ptr<ASTScope>(new (getASTContext()) ASTScope(this));`
`1752`	`1751`	`return *Scope.get();`