Merge pull request #60881 from xedin/issue-60586-5.7

[5.7][ConstraintSystem] Fix result builder discovery in leading-dot syntax calls

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -9866,7 +9866,9 @@ static Type getOpenedResultBuilderTypeFor(ConstraintSystem &cs,
   auto *calleeLocator = cs.getCalleeLocator(cs.getConstraintLocator(locator));
   auto selectedOverload = cs.findSelectedOverloadFor(calleeLocator);
   if (!(selectedOverload &&
-        selectedOverload->choice.getKind() == OverloadChoiceKind::Decl))
+        (selectedOverload->choice.getKind() == OverloadChoiceKind::Decl ||
+         selectedOverload->choice.getKind() ==
+             OverloadChoiceKind::DeclViaUnwrappedOptional)))
     return Type();
 
   auto *choice = selectedOverload->choice.getDecl();

test/Constraints/result_builder.swift

@@ -1198,3 +1198,19 @@ func test_callAsFunction_with_resultBuilder() {
 test_callAsFunction_with_resultBuilder()
 // CHECK: (0, "with parens", true)
 // CHECK: (1, "without parens", true)
+
+do {
+  struct S {
+    static func test<T>(@TupleBuilder _ body: (Bool) -> T) -> S {
+      print(body(true))
+      return .init()
+    }
+  }
+
+  let _: S? = .test {
+    42
+    ""
+    [$0]
+  }
+  // CHECK: (42, "", [true])
+}