ASTScope: Remove VarDeclScope

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -1061,8 +1061,6 @@ class AbstractPatternEntryScope : public ASTScopeImpl {
 
 protected:
   void printSpecifics(llvm::raw_ostream &out) const override;
-  void forEachVarDeclWithLocalizableAccessors(
-      ScopeCreator &scopeCreator, function_ref<void(VarDecl *)> foundOne) const;
 
 public:
   NullablePtr<Decl> getDeclIfAny() const override { return decl; }
@@ -1370,37 +1368,6 @@ class SubscriptDeclScope final : public ASTScopeImpl {
   }
 };
 
-class VarDeclScope final : public ASTScopeImpl {
-
-public:
-  VarDecl *const decl;
-  VarDeclScope(VarDecl *e) : decl(e) {}
-  virtual ~VarDeclScope() {}
-
-protected:
-  ASTScopeImpl *expandSpecifically(ScopeCreator &scopeCreator) override;
-
-private:
-  void expandAScopeThatDoesNotCreateANewInsertionPoint(ScopeCreator &);
-
-public:
-  std::string getClassName() const override;
-  SourceRange
-  getSourceRangeOfThisASTNode(bool omitAssertions = false) const override;
-
-protected:
-  void printSpecifics(llvm::raw_ostream &out) const override;
-
-public:
-  virtual NullablePtr<Decl> getDeclIfAny() const override { return decl; }
-  Decl *getDecl() const { return decl; }
-  NullablePtr<const void> getReferrent() const override;
-  NullablePtr<AbstractStorageDecl>
-  getEnclosingAbstractStorageDecl() const override {
-    return decl;
-  }
-};
-
 class EnumElementScope : public ASTScopeImpl {
   EnumElementDecl *const decl;
 

lib/AST/ASTScope.cpp

@@ -198,7 +198,6 @@ DEFINE_GET_CLASS_NAME(TopLevelCodeScope)
 DEFINE_GET_CLASS_NAME(SpecializeAttributeScope)
 DEFINE_GET_CLASS_NAME(DifferentiableAttributeScope)
 DEFINE_GET_CLASS_NAME(SubscriptDeclScope)
-DEFINE_GET_CLASS_NAME(VarDeclScope)
 DEFINE_GET_CLASS_NAME(EnumElementScope)
 DEFINE_GET_CLASS_NAME(IfStmtScope)
 DEFINE_GET_CLASS_NAME(WhileStmtScope)

lib/AST/ASTScopeCreation.cpp

@@ -973,7 +973,6 @@ NO_NEW_INSERTION_POINT(IfStmtScope)
 NO_NEW_INSERTION_POINT(RepeatWhileScope)
 NO_NEW_INSERTION_POINT(SubscriptDeclScope)
 NO_NEW_INSERTION_POINT(SwitchStmtScope)
-NO_NEW_INSERTION_POINT(VarDeclScope)
 NO_NEW_INSERTION_POINT(WhileStmtScope)
 
 NO_EXPANSION(GenericParamScope)
@@ -1019,6 +1018,7 @@ PatternEntryDeclScope::expandAScopeThatCreatesANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   // Initializers come before VarDecls, e.g. PCMacro/didSet.swift 19
   auto patternEntry = getPatternEntry();
+
   // Create a child for the initializer, if present.
   // Cannot trust the source range given in the ASTScopeImpl for the end of the
   // initializer (because of InterpolatedLiteralStrings and EditorPlaceHolders),
@@ -1035,10 +1035,12 @@ PatternEntryDeclScope::expandAScopeThatCreatesANewInsertionPoint(
         .constructExpandAndInsertUncheckable<PatternEntryInitializerScope>(
             this, decl, patternEntryIndex, vis);
   }
+
   // Add accessors for the variables in this pattern.
-  forEachVarDeclWithLocalizableAccessors(scopeCreator, [&](VarDecl *var) {
-    scopeCreator.ifUniqueConstructExpandAndInsert<VarDeclScope>(this, var);
+  patternEntry.getPattern()->forEachVariable([&](VarDecl *var) {
+    scopeCreator.addChildrenForAllLocalizableAccessorsInSourceOrder(var, this);
   });
+
   ASTScopeAssert(!handleUseBeforeDef,
                  "next line is wrong otherwise; would need a use scope");
 
@@ -1273,11 +1275,6 @@ void CaseStmtBodyScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
   scopeCreator.addToScopeTree(stmt->getBody(), this);
 }
 
-void VarDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
-    ScopeCreator &scopeCreator) {
-  scopeCreator.addChildrenForAllLocalizableAccessorsInSourceOrder(decl, this);
-}
-
 void SubscriptDeclScope::expandAScopeThatDoesNotCreateANewInsertionPoint(
     ScopeCreator &scopeCreator) {
   scopeCreator.addChildrenForKnownAttributes(decl, this);
@@ -1427,19 +1424,6 @@ AbstractPatternEntryScope::AbstractPatternEntryScope(
                  "out of bounds");
 }
 
-void AbstractPatternEntryScope::forEachVarDeclWithLocalizableAccessors(
-    ScopeCreator &scopeCreator, function_ref<void(VarDecl *)> foundOne) const {
-  getPatternEntry().getPattern()->forEachVariable([&](VarDecl *var) {
-    bool hasParsedAccessors = false;
-    var->visitParsedAccessors([&](AccessorDecl *) {
-      hasParsedAccessors = true;
-    });
-
-    if (hasParsedAccessors)
-      foundOne(var);
-  });
-}
-
 // Following must be after uses to ensure templates get instantiated
 #pragma mark getEnclosingAbstractStorageDecl
 
@@ -1531,7 +1515,6 @@ GET_REFERRENT(AbstractFunctionDeclScope, getDecl())
 GET_REFERRENT(PatternEntryDeclScope, getPattern())
 GET_REFERRENT(TopLevelCodeScope, getDecl())
 GET_REFERRENT(SubscriptDeclScope, getDecl())
-GET_REFERRENT(VarDeclScope, getDecl())
 GET_REFERRENT(GenericParamScope, paramList->getParams()[index])
 GET_REFERRENT(AbstractStmtScope, getStmt())
 GET_REFERRENT(CaptureListScope, getExpr())

lib/AST/ASTScopePrinting.cpp

@@ -188,10 +188,6 @@ void SubscriptDeclScope::printSpecifics(llvm::raw_ostream &out) const {
   decl->dumpRef(out);
 }
 
-void VarDeclScope::printSpecifics(llvm::raw_ostream &out) const {
-  decl->dumpRef(out);
-}
-
 void ConditionalClausePatternUseScope::printSpecifics(
     llvm::raw_ostream &out) const {
   pattern->print(out);

lib/AST/ASTScopeSourceRange.cpp

@@ -258,12 +258,6 @@ SourceRange PatternEntryInitializerScope::getSourceRangeOfThisASTNode(
   return initAsWrittenWhenCreated->getSourceRange();
 }
 
-SourceRange
-VarDeclScope::getSourceRangeOfThisASTNode(const bool omitAssertions) const {
-  const auto br = decl->getBracesRange();
-  return br.isValid() ? br : decl->getSourceRange();
-}
-
 SourceRange GenericParamScope::getSourceRangeOfThisASTNode(
     const bool omitAssertions) const {
   auto nOrE = holder;