ASTScope: Fold AbstractFunctionBodyScope into FunctionBodyScope

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -929,12 +929,13 @@ class ParameterListScope final : public ASTScopeImpl {
   NullablePtr<const void> addressForPrinting() const override { return params; }
 };
 
-class AbstractFunctionBodyScope : public ASTScopeImpl {
+/// Body of functions, methods, constructors, destructors and accessors.
+class FunctionBodyScope : public ASTScopeImpl {
 public:
   AbstractFunctionDecl *const decl;
 
-  AbstractFunctionBodyScope(AbstractFunctionDecl *e) : decl(e) {}
-  virtual ~AbstractFunctionBodyScope() {}
+  FunctionBodyScope(AbstractFunctionDecl *e) : decl(e) {}
+  virtual ~FunctionBodyScope() {}
 
 protected:
   ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
@@ -956,19 +957,11 @@ class AbstractFunctionBodyScope : public ASTScopeImpl {
   bool lookupLocalsOrMembers(DeclConsumer) const override;
 
 public:
+  std::string getClassName() const override;
   NullablePtr<ASTScopeImpl> insertionPointForDeferredExpansion() override;
   SourceRange sourceRangeForDeferredExpansion() const override;
 };
 
-/// Body of functions and methods.
-class FunctionBodyScope final : public AbstractFunctionBodyScope {
-public:
-  FunctionBodyScope(AbstractFunctionDecl *e)
-      : AbstractFunctionBodyScope(e) {}
-  std::string getClassName() const override;
-  bool lookupLocalsOrMembers(DeclConsumer consumer) const override;
-};
-
 class DefaultArgumentInitializerScope final : public ASTScopeImpl {
 public:
   ParamDecl *const decl;

lib/AST/ASTScopeCreation.cpp

@@ -984,7 +984,7 @@ CREATES_NEW_INSERTION_POINT(GenericTypeOrExtensionScope)
 CREATES_NEW_INSERTION_POINT(BraceStmtScope)
 CREATES_NEW_INSERTION_POINT(TopLevelCodeScope)
 
-NO_NEW_INSERTION_POINT(AbstractFunctionBodyScope)
+NO_NEW_INSERTION_POINT(FunctionBodyScope)
 NO_NEW_INSERTION_POINT(AbstractFunctionDeclScope)
 NO_NEW_INSERTION_POINT(AttachedPropertyWrapperScope)
 NO_NEW_INSERTION_POINT(EnumElementScope)
@@ -1224,7 +1224,7 @@ void EnumElementScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   // scopeCreator.addToScopeTree(decl->getStructuralRawValueExpr(), this);
 }
 
-void AbstractFunctionBodyScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
+void FunctionBodyScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   expandBody(scopeCreator);
 }
@@ -1552,7 +1552,7 @@ void *ScopeCreator::operator new(size_t bytes, const ASTContext &ctx,
 
 #pragma mark - expandBody
 
-void AbstractFunctionBodyScope::expandBody(ScopeCreator &scopeCreator) {
+void FunctionBodyScope::expandBody(ScopeCreator &scopeCreator) {
   scopeCreator.addToScopeTree(decl->getBody(), this);
 }
 
@@ -1615,7 +1615,7 @@ NullablePtr<ASTScopeImpl> ASTScopeImpl::insertionPointForDeferredExpansion() {
 }
 
 NullablePtr<ASTScopeImpl>
-AbstractFunctionBodyScope::insertionPointForDeferredExpansion() {
+FunctionBodyScope::insertionPointForDeferredExpansion() {
   return getParent().get();
 }
 

lib/AST/ASTScopeLookup.cpp

@@ -302,19 +302,13 @@ bool CaseStmtBodyScope::lookupLocalsOrMembers(DeclConsumer consumer) const {
   return false;
 }
 
-bool AbstractFunctionBodyScope::lookupLocalsOrMembers(
+bool FunctionBodyScope::lookupLocalsOrMembers(
     DeclConsumer consumer) const {
   if (auto *paramList = decl->getParameters()) {
     for (auto *paramDecl : *paramList)
       if (consumer.consume({paramDecl}, DeclVisibilityKind::FunctionParameter))
         return true;
   }
-  return false;
-}
-
-bool FunctionBodyScope::lookupLocalsOrMembers(DeclConsumer consumer) const {
-  if (AbstractFunctionBodyScope::lookupLocalsOrMembers(consumer))
-    return true;
 
   if (decl->getDeclContext()->isTypeContext()) {
     return consumer.consume({decl->getImplicitSelfDecl()},

lib/AST/ASTScopeSourceRange.cpp

@@ -213,7 +213,7 @@ SourceRange DifferentiableAttributeScope::getSourceRangeOfThisASTNode(
   return differentiableAttr->getRange();
 }
 
-SourceRange AbstractFunctionBodyScope::getSourceRangeOfThisASTNode(
+SourceRange FunctionBodyScope::getSourceRangeOfThisASTNode(
     const bool omitAssertions) const {
   return decl->getOriginalBodySourceRange();
 }
@@ -592,7 +592,7 @@ SourceRange ASTScopeImpl::sourceRangeForDeferredExpansion() const {
 SourceRange IterableTypeScope::sourceRangeForDeferredExpansion() const {
   return portion->sourceRangeForDeferredExpansion(this);
 }
-SourceRange AbstractFunctionBodyScope::sourceRangeForDeferredExpansion() const {
+SourceRange FunctionBodyScope::sourceRangeForDeferredExpansion() const {
   const auto bsr = decl->getOriginalBodySourceRange();
   const SourceLoc endEvenIfNoCloseBraceAndEndsWithInterpolatedStringLiteral =
       getLocEncompassingPotentialLookups(getSourceManager(), bsr.End);