ASTScope: Remove getEnclosingAbstractStorageDecl()

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -345,9 +345,6 @@ class ASTScopeImpl {
   virtual SourceRange sourceRangeForDeferredExpansion() const;
 
 public:
-  virtual NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const;
-
   bool isATypeDeclScope() const;
 
 private:
@@ -845,9 +842,6 @@ class GenericParamScope final : public ASTScopeImpl {
   void printSpecifics(llvm::raw_ostream &out) const override;
 
 public:
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override;
-
   NullablePtr<const void> addressForPrinting() const override {
     return paramList;
   }
@@ -883,9 +877,6 @@ class AbstractFunctionDeclScope final : public ASTScopeImpl {
   virtual NullablePtr<Decl> getDeclIfAny() const override { return decl; }
   Decl *getDecl() const { return decl; }
 
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override;
-
   NullablePtr<const void> getReferrent() const override;
 
 protected:
@@ -919,8 +910,6 @@ class ParameterListScope final : public ASTScopeImpl {
   getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
   virtual NullablePtr<DeclContext> getDeclContext() const override;
 
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override;
   NullablePtr<const void> addressForPrinting() const override { return params; }
 };
 
@@ -1285,9 +1274,6 @@ class SpecializeAttributeScope final : public ASTScopeImpl {
     return specializeAttr;
   }
 
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override;
-
   NullablePtr<DeclAttribute> getDeclAttributeIfAny() const override {
     return specializeAttr;
   }
@@ -1318,9 +1304,6 @@ class DifferentiableAttributeScope final : public ASTScopeImpl {
     return differentiableAttr;
   }
 
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override;
-
   NullablePtr<DeclAttribute> getDeclAttributeIfAny() const override {
     return differentiableAttr;
   }
@@ -1362,10 +1345,6 @@ class SubscriptDeclScope final : public ASTScopeImpl {
 
 protected:
   NullablePtr<const GenericParamList> genericParams() const override;
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override {
-    return decl;
-  }
 };
 
 class EnumElementScope : public ASTScopeImpl {

lib/AST/ASTScopeCreation.cpp

@@ -1424,35 +1424,6 @@ AbstractPatternEntryScope::AbstractPatternEntryScope(
                  "out of bounds");
 }
 
-// Following must be after uses to ensure templates get instantiated
-#pragma mark getEnclosingAbstractStorageDecl
-
-NullablePtr<AbstractStorageDecl>
-ASTScopeImpl::getEnclosingAbstractStorageDecl() const {
-  return nullptr;
-}
-
-NullablePtr<AbstractStorageDecl>
-SpecializeAttributeScope::getEnclosingAbstractStorageDecl() const {
-  return getParent().get()->getEnclosingAbstractStorageDecl();
-}
-NullablePtr<AbstractStorageDecl>
-DifferentiableAttributeScope::getEnclosingAbstractStorageDecl() const {
-  return getParent().get()->getEnclosingAbstractStorageDecl();
-}
-NullablePtr<AbstractStorageDecl>
-AbstractFunctionDeclScope::getEnclosingAbstractStorageDecl() const {
-  return getParent().get()->getEnclosingAbstractStorageDecl();
-}
-NullablePtr<AbstractStorageDecl>
-ParameterListScope::getEnclosingAbstractStorageDecl() const {
-  return getParent().get()->getEnclosingAbstractStorageDecl();
-}
-NullablePtr<AbstractStorageDecl>
-GenericParamScope::getEnclosingAbstractStorageDecl() const {
-  return getParent().get()->getEnclosingAbstractStorageDecl();
-}
-
 bool ASTScopeImpl::isATypeDeclScope() const {
   Decl *const pd = getDeclIfAny().getPtrOrNull();
   return pd && (isa<NominalTypeDecl>(pd) || isa<ExtensionDecl>(pd));