Merge pull request #26859 from davidungar/A-8-15-astscope-off

[NameLookup ASTScopes] Still off-by-default, but much closer to turning on

Author: David Ungar

include/swift/AST/ASTScope.h

@@ -160,6 +160,22 @@ FRONTEND_STATISTIC(AST, NumUnqualifiedLookup)
 /// AnyObject lookup.
 FRONTEND_STATISTIC(AST, NumModuleLookupClassMember)
 
+/// Number of body scopes for iterable types
+FRONTEND_STATISTIC(AST, NumIterableTypeBodyASTScopes)
+
+/// Number of expansions of body scopes for iterable types
+FRONTEND_STATISTIC(AST, NumIterableTypeBodyASTScopeExpansions)
+
+/// Number of brace statment scopes for iterable types
+FRONTEND_STATISTIC(AST, NumBraceStmtASTScopes)
+
+/// Number of expansions of brace statement scopes for iterable types
+FRONTEND_STATISTIC(AST, NumBraceStmtASTScopeExpansions)
+
+/// Number of ASTScope lookups
+FRONTEND_STATISTIC(AST, NumASTScopeLookups)
+
+
 /// Number of full function bodies parsed.
 FRONTEND_STATISTIC(Parse, NumFunctionsParsed)
 

include/swift/Basic/Statistics.def

@@ -297,6 +297,7 @@ class CompilerInvocation {
   /// Called from lldb, see rdar://53971116
   void disableASTScopeLookup() {
     LangOpts.EnableASTScopeLookup = false;
+    LangOpts.LazyASTScopes = false;
   }
 
   CodeCompletionCallbacksFactory *getCodeCompletionFactory() const {

include/swift/Frontend/Frontend.h

@@ -41,6 +41,8 @@ llvm::SmallVector<const ASTScopeImpl *, 0> ASTScope::unqualifiedLookup(
     SourceFile *SF, DeclName name, SourceLoc loc,
     const DeclContext *startingContext,
     namelookup::AbstractASTScopeDeclConsumer &consumer) {
+  if (auto *s = SF->getASTContext().Stats)
+    ++s->getFrontendCounters().NumASTScopeLookups;
   return ASTScopeImpl::unqualifiedLookup(SF, name, loc, startingContext,
                                          consumer);
 }
@@ -82,7 +84,7 @@ AbstractClosureScope::getClosureIfClosureScope() const {
 
 // Conservative, because using precise info would be circular
 SourceRange
-AttachedPropertyWrapperScope::getSourceRangeFor(const VarDecl *const vd) {
+AttachedPropertyWrapperScope::getSourceRangeOfVarDecl(const VarDecl *const vd) {
   SourceRange sr;
   for (auto *attr : vd->getAttrs().getAttributes<CustomAttr>()) {
     if (sr.isInvalid())

lib/AST/ASTScope.cpp

@@ -58,7 +58,7 @@ const ASTScopeImpl *ASTScopeImpl::findStartingScopeForLookup(
 
   auto *const fileScope = sourceFile->getScope().impl;
   // Parser may have added decls to source file, since previous lookup
-  sourceFile->getScope().impl->addNewDeclsToTree();
+  sourceFile->getScope().impl->addNewDeclsToScopeTree();
   if (name.isOperator())
     return fileScope; // operators always at file scope
 
@@ -119,8 +119,8 @@ const ASTScopeImpl *ASTScopeImpl::findInnermostEnclosingScopeImpl(
                                                       scopeCreator);
 }
 
-bool ASTScopeImpl::checkChildlessSourceRange() const {
-  const auto r = getChildlessSourceRange();
+bool ASTScopeImpl::checkSourceRangeOfThisASTNode() const {
+  const auto r = getSourceRangeOfThisASTNode();
   (void)r;
   assert(!getSourceManager().isBeforeInBuffer(r.End, r.Start));
   return true;
@@ -134,19 +134,21 @@ ASTScopeImpl::findChildContaining(SourceLoc loc,
     SourceManager &sourceMgr;
 
     bool operator()(const ASTScopeImpl *scope, SourceLoc loc) {
-      assert(scope->checkChildlessSourceRange());
-      return sourceMgr.isBeforeInBuffer(scope->getSourceRange().End, loc);
+      assert(scope->checkSourceRangeOfThisASTNode());
+      return sourceMgr.isBeforeInBuffer(scope->getSourceRangeOfScope().End,
+                                        loc);
     }
     bool operator()(SourceLoc loc, const ASTScopeImpl *scope) {
-      assert(scope->checkChildlessSourceRange());
-      return sourceMgr.isBeforeInBuffer(loc, scope->getSourceRange().End);
+      assert(scope->checkSourceRangeOfThisASTNode());
+      return sourceMgr.isBeforeInBuffer(loc,
+                                        scope->getSourceRangeOfScope().End);
     }
   };
   auto *const *child = std::lower_bound(
       getChildren().begin(), getChildren().end(), loc, CompareLocs{sourceMgr});
 
   if (child != getChildren().end() &&
-      sourceMgr.rangeContainsTokenLoc((*child)->getSourceRange(), loc))
+      sourceMgr.rangeContainsTokenLoc((*child)->getSourceRangeOfScope(), loc))
     return *child;
 
   return nullptr;

lib/AST/ASTScopeCreation.cpp

@@ -126,7 +126,7 @@ static void printSourceRange(llvm::raw_ostream &out, const SourceRange range,
 void ASTScopeImpl::printRange(llvm::raw_ostream &out) const {
   if (!isSourceRangeCached(true))
     out << "(uncached) ";
-  SourceRange range = getUncachedSourceRange(/*omitAssertions=*/true);
+  SourceRange range = computeSourceRangeOfScope(/*omitAssertions=*/true);
   printSourceRange(out, range, getSourceManager());
 }
 
@@ -151,10 +151,11 @@ NullablePtr<const void> ASTScopeImpl::addressForPrinting() const {
 void GenericTypeOrExtensionScope::printSpecifics(llvm::raw_ostream &out) const {
   if (shouldHaveABody() && !doesDeclHaveABody())
     out << "<no body>";
-  else if (auto *n = getCorrespondingNominalTypeDecl().getPtrOrNull())
-    out << "'" << n->getFullName() << "'";
-  else
-    out << "<no extended nominal?!>";
+  // Sadly, the following can trip assertions
+  //  else if (auto *n = getCorrespondingNominalTypeDecl().getPtrOrNull())
+  //    out << "'" << n->getFullName() << "'";
+  //  else
+  //    out << "<no extended nominal?!>";
 }
 
 void GenericParamScope::printSpecifics(llvm::raw_ostream &out) const {