Merge pull request #28770 from xedin/rdar-57843297

[Diagnostics] Upon keypath result contextual mismatch try to match ob…

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -2842,6 +2842,13 @@ bool ConstraintSystem::repairFailures(
       if (fnType && fnType->getResult()->isEqual(rhs))
         return true;
 
+      auto lastComponentType = lhs->lookThroughAllOptionalTypes();
+      auto keyPathResultType = rhs->lookThroughAllOptionalTypes();
+
+      // Propagate contextual information from/to keypath result type.
+      (void)matchTypes(lastComponentType, keyPathResultType, matchKind,
+                       TMF_ApplyingFix, getConstraintLocator(locator));
+
       conversionsOrFixes.push_back(IgnoreContextualType::create(
           *this, lhs, rhs, getConstraintLocator(locator)));
       return true;

test/Constraints/keypath.swift

@@ -102,3 +102,16 @@ func rdar56131416() {
   // This type should be selected correctly.
   Rdar56131416.takesCorrectType(result)
 }
+
+func test_mismatch_with_contextual_optional_result() {
+  struct A<T> {
+    init<U: Collection>(_ data: T, keyPath: KeyPath<T, U?>) {}
+  }
+
+  struct B {
+    var arr: [Int] = []
+  }
+
+  let _ = A(B(), keyPath: \.arr)
+  // expected-error@-1 {{key path value type '[Int]' cannot be converted to contextual type '[Int]?'}}
+}