Merge pull request #18329 from gregomni/7339

[Sema] Better key path failure diagnosis for unresolved roots

Author: gregomni

lib/Sema/CSDiag.cpp

@@ -7102,6 +7102,19 @@ static bool diagnoseKeyPathComponents(ConstraintSystem &CS, KeyPathExpr *KPE,
                                       Type rootType) {
   auto &TC = CS.TC;
 
+  // The constraint system may have been unable to resolve the actual root
+  // type. The generic interface type of the root produces better
+  // diagnostics in this case.
+  if (rootType->hasUnresolvedType() && !KPE->isObjC() && KPE->getRootType()) {
+    if (auto ident = dyn_cast<ComponentIdentTypeRepr>(KPE->getRootType())) {
+      if (auto decl = ident->getBoundDecl()) {
+        if (auto metaType = decl->getInterfaceType()->castTo<MetatypeType>()) {
+          rootType = metaType->getInstanceType();
+        }
+      }
+    }
+  }
+
   // The key path string we're forming.
   SmallString<32> keyPathScratch;
   llvm::raw_svector_ostream keyPathOS(keyPathScratch);

test/Constraints/keypath.swift

@@ -19,3 +19,18 @@ func test() {
 
   let _ = C()[keyPath: \.i] // no warning for a read
 }
+
+// SR-7339
+class Some<T, V> {
+  init(keyPath: KeyPath<T, ((V) -> Void)?>) {
+  }
+}
+
+class Demo {
+  var here: (() -> Void)?
+}
+
+// FIXME: This error is better than it was, but the diagnosis should break it down more specifically to 'here's type.
+let some = Some(keyPath: \Demo.here)
+// expected-error@-1 {{cannot convert value of type 'ReferenceWritableKeyPath<Demo, (() -> Void)?>' to expected argument type 'KeyPath<_, ((_) -> Void)?>'}}
+