Merge pull request #70337 from xedin/rdar-72864716

[CSBindings] Unwrap optionals from contextual function type used as a…

Author: xedin

lib/Sema/CSBindings.cpp

@@ -667,8 +667,9 @@ void BindingSet::finalize(
         assert(isKnownKeyPathType(bindingTy) || bindingTy->is<FunctionType>());
 
         // Functions don't have capability so we can simply add them.
-        if (bindingTy->is<FunctionType>())
-          updatedBindings.insert(binding);
+        if (auto *fnType = bindingTy->getAs<FunctionType>()) {
+          updatedBindings.insert(binding.withType(fnType));
+        }
       }
 
       // Note that even though key path literal maybe be invalid it's

test/Constraints/keypath.swift

@@ -304,3 +304,17 @@ func test_invalid_argument_to_keypath_subscript() {
     // expected-error@-1 {{cannot use value of type 'A' as a key path subscript index; argument must be a key path}}
   }
 }
+
+extension Collection {
+  func prefix<R: RangeExpression>(
+    _ range: R,
+    while predicate: ((Element) -> Bool)? = nil
+  ) -> SubSequence where R.Bound == Self.Index {
+    fatalError()
+  }
+}
+
+// https://github.com/apple/swift/issues/56393
+func keypathToFunctionWithOptional() {
+  _ = Array("").prefix(1...4, while: \.isNumber) // Ok
+}