Merge pull request #71372 from apple/function-keypath-follow-ups

Follow ups for keypath function conversion PR

Author: xedin

include/swift/AST/DiagnosticsSema.def

@@ -697,10 +697,10 @@ ERROR(expr_smart_keypath_application_type_mismatch,none,
       "key path of type %0 cannot be applied to a base of type %1",
       (Type, Type))
 ERROR(expr_keypath_root_type_mismatch, none,
-      "key path root type %0 cannot be converted to contextual type %1",
+      "cannot convert key path root type %0 to contextual type %1",
       (Type, Type))
 ERROR(expr_keypath_type_mismatch, none,
-      "key path of type %0 cannot be converted to contextual type %1",
+      "cannot convert key path of type %0 to contextual type %1",
       (Type, Type))
 ERROR(expr_keypath_application_root_type_mismatch, none,
       "key path with root type %0 cannot be applied to a base of type %1",

lib/Sema/CSSimplify.cpp

@@ -12286,8 +12286,8 @@ ConstraintSystem::simplifyKeyPathConstraint(
       auto paramFnTy = FunctionType::get(paramParam, fnTy->getResult(),
                                          fnTy->getExtInfo());
 
-      return matchTypes(kpFnTy, paramFnTy, ConstraintKind::Conversion, subflags,
-                        locator).isSuccess();
+      return !matchTypes(kpFnTy, paramFnTy, ConstraintKind::Conversion,
+                         subflags, locator).isFailure();
     }
 
     assert(contextualRootTy && contextualValueTy);

test/Constraints/keypath.swift

@@ -81,8 +81,8 @@ func testVariadicKeypathAsFunc() {
 
   // These are not okay, the KeyPath should have a base that matches the
   // internal parameter type of the function, i.e (S...).
-  let _: (S...) -> Int = \S.i // expected-error {{key path root type 'S' cannot be converted to contextual type 'S...'}}
-  takesVariadicFnWithGenericRet(\S.i) // expected-error {{key path root type 'S' cannot be converted to contextual type 'S...'}}
+  let _: (S...) -> Int = \S.i // expected-error {{cannot convert key path root type 'S' to contextual type 'S...'}}
+  takesVariadicFnWithGenericRet(\S.i) // expected-error {{cannot convert key path root type 'S' to contextual type 'S...'}}
 }
 
 // rdar://problem/54322807