Added fix-it to add the @unchecked Sendable conformance if it is not re-stated (#75233)

tplaymeow · Timur Guliamov · web-flow · commit dd221a8e0115 · 2024-07-18T14:14:12.000+09:00
Co-authored-by: Timur Guliamov &lt;tplaymeow@MacBook-Pro-Timur-2.local&gt;
diff --git a/lib/Sema/TypeCheckConcurrency.cpp b/lib/Sema/TypeCheckConcurrency.cpp
@@ -6244,8 +6244,9 @@ bool swift::checkSendableConformance(
         return false;
     }
 
-    nominal->diagnose(diag::restate_unchecked_sendable,
-                      nominal->getName());
+    auto diag =
+        nominal->diagnose(diag::restate_unchecked_sendable, nominal->getName());
+    addSendableFixIt(nominal, diag, /*unchecked=*/true);
     return false;
   }
 
diff --git a/test/Concurrency/concurrent_value_checking.swift b/test/Concurrency/concurrent_value_checking.swift
@@ -361,7 +361,7 @@ class C5: @unchecked Sendable {
   var x: Int = 0 // okay
 }
 
-// expected-warning@+1 {{class 'C6' must restate inherited '@unchecked Sendable' conformance}}
+// expected-warning@+1 {{class 'C6' must restate inherited '@unchecked Sendable' conformance}}{{13-13=, @unchecked Sendable}}
 class C6: C5 {
   var y: Int = 0 // still okay, it's unsafe
 }

Original file line number	Diff line number	Diff line change
`@@ -6244,8 +6244,9 @@ bool swift::checkSendableConformance(`
`6244`	`6244`	`return false;`
`6245`	`6245`	`}`
`6246`	`6246`
`6247`		`- nominal->diagnose(diag::restate_unchecked_sendable,`
`6248`		`- nominal->getName());`
	`6247`	`+ auto diag =`
	`6248`	`+ nominal->diagnose(diag::restate_unchecked_sendable, nominal->getName());`
	`6249`	`+ addSendableFixIt(nominal, diag, /unchecked=/true);`
`6249`	`6250`	`return false;`
`6250`	`6251`	`}`
`6251`	`6252`
Original file line number	Diff line number	Diff line change
`@@ -361,7 +361,7 @@ class C5: @unchecked Sendable {`
`361`	`361`	`var x: Int = 0 // okay`
`362`	`362`	`}`
`363`	`363`
`364`		`-// expected-warning@+1 {{class 'C6' must restate inherited '@unchecked Sendable' conformance}}`
	`364`	`+// expected-warning@+1 {{class 'C6' must restate inherited '@unchecked Sendable' conformance}}{{13-13=, @unchecked Sendable}}`
`365`	`365`	`class C6: C5 {`
`366`	`366`	`var y: Int = 0 // still okay, it's unsafe`
`367`	`367`	`}`