Merge pull request #64786 from calda/cal--64757

[SE-0365] Fix #64757: Unexpected "Implicit use of 'self' in closure" error in closure nested in result builder

Author: xedin

lib/Sema/MiscDiagnostics.cpp

@@ -2015,6 +2015,7 @@ static void diagnoseImplicitSelfUseInClosure(const Expr *E,
       DC = DC->getParent();
     }
   }
+  
   const_cast<Expr *>(E)->walk(DiagnoseWalker(ctx, ACE));
 }
 

lib/Sema/TypeChecker.h

@@ -461,7 +461,7 @@ void typeCheckASTNode(ASTNode &node, DeclContext *DC,
 /// value if an error occurred while type checking the transformed body.
 Optional<BraceStmt *> applyResultBuilderBodyTransform(
     FuncDecl *func, Type builderType,
-    bool ClosuresInResultBuilderDontParticipateInInference = true);
+    bool ClosuresInResultBuilderDontParticipateInInference = false);
 
 /// Find the return statements within the body of the given function.
 std::vector<ReturnStmt *> findReturnStatements(AnyFunctionRef fn);

test/expr/closure/closures.swift

@@ -891,3 +891,34 @@ func test60781() -> Int {
 func test60781_MultiArg() -> Int {
   f60781({ 1 }, { 1 }) // expected-error{{conflicting arguments to generic parameter 'T' ('Int' vs. '() -> Int')}}
 }
+
+@resultBuilder
+struct VoidBuilder {
+  static func buildBlock() -> Void { }
+  static func buildPartialBlock<T>(first: T) -> Void { }
+  static func buildPartialBlock<T>(accumulated: Void, next: T) -> Void { }
+}
+
+final class EscapingWrapper {
+  static func wrapper(_ closure: @escaping () -> Void) {
+    closure()
+  }
+}
+
+final class TestGithubIssue64757 {
+  var instanceProperty: String = "instance property"
+  
+  @VoidBuilder
+  var void: Void {
+    EscapingWrapper.wrapper { [weak self] in
+      print(instanceProperty) // expected-error {{reference to property 'instanceProperty' in closure requires explicit use of 'self' to make capture semantics explicit}}
+      
+      if let self {
+        print(instanceProperty)
+      }
+      
+      guard let self else { return }
+      print(instanceProperty)
+    }
+  }
+}