Merge pull request #42484 from xedin/drop-se-0326-flag

[TypeChecker] NFC: Remove `-experimental-multi-statement-closures` flag

Author: xedin

include/swift/Basic/LangOptions.h

@@ -759,10 +759,6 @@ namespace swift {
     /// parameters of closures.
     bool EnableOneWayClosureParameters = false;
 
-    /// Enable experimental support for type inference through multi-statement
-    /// closures.
-    bool EnableMultiStatementClosureInference = true;
-
     /// See \ref FrontendOptions.PrintFullConvention
     bool PrintFullConvention = false;
   };

include/swift/Option/FrontendOptions.td

@@ -900,10 +900,6 @@ def experimental_one_way_closure_params :
   Flag<["-"], "experimental-one-way-closure-params">,
   HelpText<"Enable experimental support for one-way closure parameters">;
 
-def experimental_multi_statement_closures :
-  Flag<["-"], "experimental-multi-statement-closures">,
-  HelpText<"Enable experimental support for type inference in multi-statement closures">;
-
 def prebuilt_module_cache_path :
   Separate<["-"], "prebuilt-module-cache-path">,
   HelpText<"Directory of prebuilt modules for loading module interfaces">;

lib/Frontend/CompilerInvocation.cpp

@@ -1146,9 +1146,6 @@ static bool ParseTypeCheckerArgs(TypeCheckerOptions &Opts, ArgList &Args,
   Opts.EnableOneWayClosureParameters |=
       Args.hasArg(OPT_experimental_one_way_closure_params);
 
-  Opts.EnableMultiStatementClosureInference |=
-      Args.hasArg(OPT_experimental_multi_statement_closures);
-
   Opts.PrintFullConvention |=
       Args.hasArg(OPT_experimental_print_full_convention);
 

lib/Sema/ConstraintSystem.cpp

@@ -6639,9 +6639,7 @@ bool ConstraintSystem::participatesInInference(ClosureExpr *closure) const {
   if (Options.contains(ConstraintSystemFlags::LeaveClosureBodyUnchecked))
     return false;
 
-  auto &ctx = closure->getASTContext();
-  if (closure->hasEmptyBody() ||
-      !ctx.TypeCheckerOpts.EnableMultiStatementClosureInference)
+  if (closure->hasEmptyBody())
     return false;
 
   // If body is nested in a parent that has a function builder applied,

lib/Sema/MiscDiagnostics.cpp

@@ -64,14 +64,10 @@ bool BaseDiagnosticWalker::shouldWalkIntoDeclInClosureContext(Decl *D) {
   if (closure->isSeparatelyTypeChecked())
     return false;
 
-  auto &opts = D->getASTContext().TypeCheckerOpts;
-
-  // If multi-statement inference is enabled, let's not walk
-  // into declarations contained in a multi-statement closure
-  // because they'd be handled via `typeCheckDecl` that runs
+  // Let's not walk into declarations contained in a multi-statement
+  // closure because they'd be handled via `typeCheckDecl` that runs
   // syntactic diagnostics.
-  if (opts.EnableMultiStatementClosureInference &&
-      !closure->hasSingleExpressionBody()) {
+  if (!closure->hasSingleExpressionBody()) {
     // Since pattern bindings get their types through solution application,
     // `typeCheckDecl` doesn't touch initializers (because they are already
     // fully type-checked), so pattern bindings have to be allowed to be

lib/Sema/PreCheckExpr.cpp

@@ -1443,12 +1443,10 @@ namespace {
     bool walkToDeclPre(Decl *D) override { return isa<PatternBindingDecl>(D); }
 
     std::pair<bool, Pattern *> walkToPatternPre(Pattern *pattern) override {
-      // With multi-statement closure inference enabled, constraint generation
-      // is responsible for pattern verification and type-checking in the body
-      // of the closure, so there is no need to walk into patterns.
-      bool walkIntoPatterns =
-          !(isa<ClosureExpr>(DC) &&
-            Ctx.TypeCheckerOpts.EnableMultiStatementClosureInference);
+      // Constraint generation is responsible for pattern verification and
+      // type-checking in the body of the closure, so there is no need to
+      // walk into patterns.
+      bool walkIntoPatterns = !isa<ClosureExpr>(DC);
       return {walkIntoPatterns, pattern};
     }
   };
@@ -1461,9 +1459,6 @@ bool PreCheckExpression::walkToClosureExprPre(ClosureExpr *closure) {
   if (!closure->hasSingleExpressionBody()) {
     if (LeaveClosureBodiesUnchecked)
       return false;
-
-    if (!Ctx.TypeCheckerOpts.EnableMultiStatementClosureInference)
-      return false;
   }
 
   // Update the current DeclContext to be the closure we're about to

lib/Sema/TypeCheckAvailability.cpp

@@ -3136,21 +3136,7 @@ class ExprAvailabilityWalker : public ASTWalker {
   }
 
   bool shouldWalkIntoClosure(AbstractClosureExpr *closure) const {
-    // Multi-statement closures are collected by ExprWalker::rewriteFunction
-    // and checked by ExprWalker::processDelayed in CSApply.cpp.
-    // Single-statement closures only have the attributes checked
-    // by TypeChecker::checkClosureAttributes in that rewriteFunction.
-    // Multi-statement closures will be checked explicitly later (as the decl
-    // context in the Where). Single-expression closures will not be
-    // revisited, and are not automatically set as the context of the 'where'.
-    // Don't double-check multi-statement closures, but do check
-    // single-statement closures, setting the closure as the decl context.
-    //
-    // Note about SE-0326: When a flag is enabled multi-statement closures
-    // are type-checked together with enclosing context, so walker behavior
-    // should match that of single-expression closures.
-    return closure->hasSingleExpressionBody() ||
-           Context.TypeCheckerOpts.EnableMultiStatementClosureInference;
+    return true;
   }
 
   /// Walk an abstract closure expression, checking for availability

lib/Sema/TypeCheckCodeCompletion.cpp

@@ -212,10 +212,6 @@ class SanitizeExpr : public ASTWalker {
       // If this is a closure, only walk into its children if they
       // are type-checked in the context of the enclosing expression.
       if (auto closure = dyn_cast<ClosureExpr>(expr)) {
-        // TODO: This has to be deleted once `EnableMultiStatementClosureInference`
-        //       is enabled by default.
-        if (!closure->hasSingleExpressionBody())
-          return { false, expr };
         for (auto &Param : *closure->getParameters()) {
           Param->setSpecifier(swift::ParamSpecifier::Default);
         }

test/expr/closure/multi_statement.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -swift-version 5 -experimental-multi-statement-closures -enable-experimental-static-assert
+// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-experimental-static-assert
 
 func isInt<T>(_ value: T) -> Bool {
   return value is Int

validation-test/Sema/SwiftUI/mixed_swiftui_and_multistatement_closures.swift

@@ -1,4 +1,4 @@
-// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5 -experimental-multi-statement-closures
+// RUN: %target-typecheck-verify-swift -target %target-cpu-apple-macosx10.15 -swift-version 5
 // REQUIRES: objc_interop
 // REQUIRES: OS=macosx