More test updates for Swift 6 and Sendable

Author: DougGregor

test/decl/protocol/special/Sendable_swift6.swift

@@ -4,7 +4,7 @@
 
 func acceptSendable<T: Sendable>(_: T) { }
 
-class NotSendable { }
+class NotSendable { } // expected-note 2{{class 'NotSendable' does not conform to the `Sendable` protocol}}
 
 func testSendableBuiltinConformances(
   i: Int, ns: NotSendable, sf: @escaping @Sendable () -> Void,
@@ -23,8 +23,11 @@ func testSendableBuiltinConformances(
 
   // Complaints about missing Sendable conformances
   acceptSendable((i, ns)) // expected-error{{type 'NotSendable' does not conform to the 'Sendable' protocol}}
-  acceptSendable(nsf) // expected-error{{function type '() -> Void' must be marked '@Sendable' to conform to 'Sendable'}}
-  acceptSendable((nsf, i)) // expected-error{{function type '() -> Void' must be marked '@Sendable' to conform to 'Sendable'}}
-  acceptSendable(funNotSendable) // expected-error{{function type '() -> Void' must be marked '@Sendable' to conform to 'Sendable'}}
+  acceptSendable(nsf) // expected-error{{type '() -> Void' does not conform to the 'Sendable' protocol}}
+  // expected-note@-1{{a function type must be marked '@Sendable' to conform to 'Sendable'}}
+  acceptSendable((nsf, i)) // expected-error{{type '() -> Void' does not conform to the 'Sendable' protocol}}
+  // expected-note@-1{{a function type must be marked '@Sendable' to conform to 'Sendable'}}
+  acceptSendable(funNotSendable) // expected-error{{type '() -> Void' does not conform to the 'Sendable' protocol}}
+  // expected-note@-1{{a function type must be marked '@Sendable' to conform to 'Sendable'}}
   acceptSendable((i, ns)) // expected-error{{type 'NotSendable' does not conform to the 'Sendable' protocol}}
 }