Merge pull request #76295 from hamishknight/capturent

Remove `shouldWalkCaptureInitializerExpressions`

Author: hamishknight

include/swift/AST/ASTWalker.h

@@ -642,11 +642,6 @@ class ASTWalker {
   /// value of a property wrapper placeholder.
   virtual bool shouldWalkIntoPropertyWrapperPlaceholderValue() { return true; }
 
-  /// This method configures whether the walker should visit the capture
-  /// initializer expressions within a capture list directly, rather than
-  /// walking the declarations.
-  virtual bool shouldWalkCaptureInitializerExpressions() { return false; }
-
   /// This method configures whether the walker should exhibit the legacy
   /// behavior where accessors appear as peers of their storage, rather
   /// than children nested inside of it.

lib/AST/ASTWalker.cpp

@@ -977,17 +977,8 @@ class Traversal : public ASTVisitor<Traversal, Expr*, Stmt*,
 
   Expr *visitCaptureListExpr(CaptureListExpr *expr) {
     for (auto c : expr->getCaptureList()) {
-      if (Walker.shouldWalkCaptureInitializerExpressions()) {
-        for (auto entryIdx : range(c.PBD->getNumPatternEntries())) {
-          if (auto newInit = doIt(c.PBD->getInit(entryIdx)))
-            c.PBD->setInit(entryIdx, newInit);
-          else
-            return nullptr;
-        }
-      } else {
-        if (doIt(c.PBD))
-          return nullptr;
-      }
+      if (doIt(c.PBD))
+        return nullptr;
     }
 
     AbstractClosureExpr *body = expr->getClosureBody();

lib/Sema/MiscDiagnostics.cpp

@@ -105,8 +105,6 @@ static void diagSyntacticUseRestrictions(const Expr *E, const DeclContext *DC,
       return Action::Continue();
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     PreWalkResult<Expr *> walkToExprPre(Expr *E) override {
       // See through implicit conversions of the expression.  We want to be able
       // to associate the parent of this expression with the ultimate callee.
@@ -1581,8 +1579,6 @@ static void diagRecursivePropertyAccess(const Expr *E, const DeclContext *DC) {
              cast<VarDecl>(DRE->getDecl())->isSelfParameter();
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     MacroWalking getMacroWalkingBehavior() const override {
       return MacroWalking::Expansion;
     }
@@ -2228,8 +2224,6 @@ static void diagnoseImplicitSelfUseInClosure(const Expr *E,
       return parentContext->getInnermostClosureForSelfCapture();
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     bool shouldRecordClosure(const AbstractClosureExpr *E) {
       // Record all closures in Swift 6 mode.
       if (Ctx.isSwiftVersionAtLeast(6))
@@ -4561,8 +4555,6 @@ static void checkStmtConditionTrailingClosure(ASTContext &ctx, const Expr *E) {
   public:
     DiagnoseWalker(ASTContext &ctx) : Ctx(ctx) { }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     MacroWalking getMacroWalkingBehavior() const override {
       return MacroWalking::Expansion;
     }
@@ -4686,8 +4678,6 @@ class ObjCSelectorWalker : public ASTWalker {
   ObjCSelectorWalker(const DeclContext *dc, Type selectorTy)
     : Ctx(dc->getASTContext()), DC(dc), SelectorTy(selectorTy) { }
 
-  bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
   MacroWalking getMacroWalkingBehavior() const override {
     return MacroWalking::Expansion;
   }
@@ -5548,8 +5538,6 @@ static void diagnoseUnintendedOptionalBehavior(const Expr *E,
       }
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     MacroWalking getMacroWalkingBehavior() const override {
       return MacroWalking::Expansion;
     }
@@ -5623,8 +5611,6 @@ static void diagnoseDeprecatedWritableKeyPath(const Expr *E,
       }
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     MacroWalking getMacroWalkingBehavior() const override {
       return MacroWalking::Expansion;
     }

lib/Sema/TypeCheckConcurrency.cpp

@@ -2905,8 +2905,6 @@ namespace {
       llvm_unreachable("expected a CallExpr in applyStack!");
     }
 
-    bool shouldWalkCaptureInitializerExpressions() override { return true; }
-
     MacroWalking getMacroWalkingBehavior() const override {
       return MacroWalking::Expansion;
     }