Merge pull request #76115 from xedin/rdar-131524246

[CSBindings] Don't prioritize closures that are assigned to overloade…

Author: xedin

lib/Sema/CSBindings.cpp

@@ -1318,7 +1318,30 @@ bool BindingSet::favoredOverDisjunction(Constraint *disjunction) const {
     // Such type variables might be connected to closure as well
     // e.g. when result type is optional, so it makes sense to
     // open closure before attempting such disjunction.
-    return boundType->lookThroughAllOptionalTypes()->is<TypeVariableType>();
+    if (auto *typeVar = boundType->lookThroughAllOptionalTypes()
+                            ->getAs<TypeVariableType>()) {
+      auto fixedType = CS.getFixedType(typeVar);
+      // Handles "assignment to an overloaded member" pattern where
+      // type variable that represents the destination is bound to an
+      // l-value type during constraint generation. See \c genAssignDestType.
+      //
+      // Note that in all other circumstances we won't be here if the
+      // type variable that presents the closure is connected to a
+      // disjunction because that would mark closure as "delayed".
+      if (fixedType && fixedType->is<LValueType>()) {
+        auto lvalueObjTy = fixedType->castTo<LValueType>()->getObjectType();
+        // Prefer closure only if it's not connected to the type variable
+        // that represents l-value object type of the assignment destination.
+        // Eagerly attempting closure first could result in missing some of
+        // the contextual annotations i.e. `@Sendable`.
+        if (auto *lvalueObjVar = lvalueObjTy->getAs<TypeVariableType>())
+          return !AdjacentVars.count(lvalueObjVar);
+      }
+
+      return true;
+    }
+
+    return false;
   }
 
   // If this is a collection literal type, it's preferrable to bind it

test/Concurrency/concurrency_attr_inference_on_closures.swift

@@ -0,0 +1,22 @@
+// RUN: %target-typecheck-verify-swift -swift-version 5
+// RUN: %target-typecheck-verify-swift -swift-version 5 -strict-concurrency=complete
+// RUN: %target-typecheck-verify-swift -swift-version 6
+
+// rdar://131524246
+
+protocol P: Sendable {
+  typealias Block = @Sendable () -> Void
+  var block: Block? { get }
+}
+
+extension P {
+  var block: Block? { nil }
+}
+
+final class Impl: P, @unchecked Sendable {
+  var block: Block?
+}
+
+func test(_ v: Impl) {
+  v.block = {} // Ok, no warnings or errors
+}