[Tests] NFC: Update and add a few test-cases related to noncopyable types in key path context

Author: xedin

test/Constraints/keypath.swift

@@ -318,3 +318,24 @@ extension Collection {
 func keypathToFunctionWithOptional() {
   _ = Array("").prefix(1...4, while: \.isNumber) // Ok
 }
+
+func test_new_key_path_type_requirements() {
+  struct V: ~Copyable {
+  }
+
+  struct S: ~Copyable {
+    var x: Int
+    var v: V
+  }
+
+  _ = \S.x // expected-error {{key path cannot refer to noncopyable type 'S'}}
+  _ = \S.v
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'S'}}
+  // expected-error@-2 {{key path cannot refer to noncopyable type 'V'}}
+
+  func test<R>(_: KeyPath<R, Int>) {} // expected-note {{'where R: Copyable' is implicit here}}
+
+  test(\S.x)
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'S'}}
+  // expected-error@-2 {{local function 'test' requires that 'S' conform to 'Copyable'}}
+}

test/Sema/keypaths_noncopyable.swift

@@ -39,11 +39,18 @@ struct C {
 
 // rdar://109287447
 public func testKeypath<V: ~Copyable>(m: consuming M<V>) {
-  _ = m[keyPath: \.nc] // expected-error {{key path cannot refer to noncopyable type 'NC'}}
-  _ = m[keyPath: \.nc.data] // expected-error {{key path cannot refer to noncopyable type 'NC'}}
-  _ = m[keyPath: \.ncg] // expected-error {{key path cannot refer to noncopyable type 'V'}}
-  _ = m[keyPath: \.ncg.protocolProp] // expected-error {{key path cannot refer to noncopyable type 'V'}}
+  _ = m[keyPath: \.nc]
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'M<V>'}}
+  // expected-error@-2 {{key path cannot refer to noncopyable type 'NC'}}
+  _ = m[keyPath: \.nc.data]
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'M<V>'}}
+  _ = m[keyPath: \.ncg]
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'M<V>'}}
+  // expected-error@-2 {{key path cannot refer to noncopyable type 'V'}}
+  _ = m[keyPath: \.ncg.protocolProp]
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'M<V>'}}
   _ = m[keyPath: \.string]
+  // expected-error@-1 {{key path cannot refer to noncopyable type 'M<V>'}}
 
   let b = Box(NC())
   _ = b.with(\.data)

test/expr/unary/keypath/keypath.swift

@@ -945,7 +945,9 @@ func testKeyPathHole() {
 
   func f(_ i: Int) {}
   f(\.x) // expected-error {{cannot infer key path type from context; consider explicitly specifying a root type}} {{6-6=<#Root#>}}
+  // expected-error@-1 {{cannot convert value of type 'KeyPath<Root, Value>' to expected argument type 'Int'}}
   f(\.x.y) // expected-error {{cannot infer key path type from context; consider explicitly specifying a root type}} {{6-6=<#Root#>}}
+  // expected-error@-1 {{cannot convert value of type 'KeyPath<Root, Value>' to expected argument type 'Int'}}
 
 func provideValueButNotRoot<T>(_ fn: (T) -> String) {} // expected-note 2 {{in call to function 'provideValueButNotRoot'}}
   provideValueButNotRoot(\.x) // expected-error {{cannot infer key path type from context; consider explicitly specifying a root type}}