Fixes for clang importer tests that I missed

gottesmm · gottesmm · commit 266432cf2022 · 2024-05-05T18:01:05.000-07:00
diff --git a/test/ClangImporter/transferring.swift b/test/ClangImporter/transferring.swift
@@ -28,7 +28,7 @@ func funcTestTransferringResult() async {
   let x2 = NonSendableCStruct()
   let y2 = returnUserDefinedFromGlobalFunction(x2)
   await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}
-  // expected-note @-1 {{sending disconnected 'x2' to main actor-isolated callee could cause races in between callee main actor-isolated and local nonisolated uses}}
+  // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}
   useValue(y2) // expected-note {{risks concurrent access}}
 }
 
diff --git a/test/ClangImporter/transferring_objc.swift b/test/ClangImporter/transferring_objc.swift
@@ -46,7 +46,7 @@ func funcTestTransferringResult() async {
   let x2 = NSObject()
   let y2 = returnNSObjectFromGlobalFunction(x2)
   await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}
-  // expected-note @-1 {{sending disconnected 'x2' to main actor-isolated callee could cause races in between callee main actor-isolated and local nonisolated uses}}
+  // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}
   useValue(y2) // expected-note {{risks concurrent access}}
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ func funcTestTransferringResult() async {`
`28`	`28`	`let x2 = NonSendableCStruct()`
`29`	`29`	`let y2 = returnUserDefinedFromGlobalFunction(x2)`
`30`	`30`	`await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}`
`31`		`- // expected-note @-1 {{sending disconnected 'x2' to main actor-isolated callee could cause races in between callee main actor-isolated and local nonisolated uses}}`
	`31`	`+ // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}`
`32`	`32`	`useValue(y2) // expected-note {{risks concurrent access}}`
`33`	`33`	`}`
`34`	`34`
Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ func funcTestTransferringResult() async {`
`46`	`46`	`let x2 = NSObject()`
`47`	`47`	`let y2 = returnNSObjectFromGlobalFunction(x2)`
`48`	`48`	`await transferToMain(x2) // expected-error {{sending 'x2' risks causing data races}}`
`49`		`- // expected-note @-1 {{sending disconnected 'x2' to main actor-isolated callee could cause races in between callee main actor-isolated and local nonisolated uses}}`
	`49`	`+ // expected-note @-1 {{sending 'x2' to main actor-isolated global function 'transferToMain' risks causing data races between main actor-isolated and local nonisolated uses}}`
`50`	`50`	`useValue(y2) // expected-note {{risks concurrent access}}`
`51`	`51`	`}`
`52`	`52`