Merge pull request #22960 from xedin/rdar-48443263

[CSSimplify] Tuple splat should account for single dependent member p…

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -1085,11 +1085,11 @@ static bool isSingleTupleParam(ASTContext &ctx,
   if (!ctx.isSwiftVersionAtLeast(5))
     paramType = paramType->lookThroughAllOptionalTypes();
 
-  // Parameter should have a label and be either a tuple tuple type,
-  // or a type variable which might later be assigned a tuple type,
-  // e.g. opened generic parameter.
+  // Parameter should not have a label and be either a tuple,
+  // type variable or a dependent member, which might later be
+  // assigned (or resolved to) a tuple type, e.g. opened generic parameter.
   return !param.hasLabel() &&
-         (paramType->is<TupleType>() || paramType->is<TypeVariableType>());
+         (paramType->is<TupleType>() || paramType->isTypeVariableOrMember());
 }
 
 /// Attempt to fix missing arguments by introducing type variables

test/Constraints/closures.swift

@@ -894,8 +894,12 @@ do {
   }
 
   func foo(_ arr: [Int]) {
+    // FIXME: This behavior related to tuple splat being allowed
+    //        in conversion between a single dependent member
+    //        parameter and empty parameter functions e.g.
+    //        () -> Void `convertable to` (T.V) -> Void.
     _ = S(arr, id: \.self_) {
-      // expected-error@-1 {{contextual type for closure argument list expects 1 argument, which cannot be implicitly ignored}} {{30-30=_ in }}
+      // expected-error@-1 {{type '_' has no member 'self_'}}
       return 42
     }
   }

test/Constraints/tuple_arguments.swift

@@ -1691,4 +1691,27 @@ _ = x.map { (_: Void) in return () }
 do {
   func f(_: Int...) {}
   let _ = [(1, 2, 3)].map(f) // expected-error {{cannot invoke 'map' with an argument list of type '((Int...) -> ())'}}
-}
+}
+
+// rdar://problem/48443263 - cannot convert value of type '() -> Void' to expected argument type '(_) -> Void'
+
+protocol P_48443263 {
+  associatedtype V
+}
+
+func rdar48443263() {
+  func foo<T : P_48443263>(_: T, _: (T.V) -> Void) {}
+
+  struct S1 : P_48443263 {
+    typealias V = Void
+  }
+
+  struct S2: P_48443263 {
+    typealias V = Int
+  }
+
+  func bar(_ s1: S1, _ s2: S2, _ fn: () -> Void) {
+    foo(s1, fn) // Ok because s.V is Void
+    foo(s2, fn) // expected-error {{cannot convert value of type '() -> Void' to expected argument type '(_) -> Void'}}
+  }
+}