[Concurrency] Apply @MainActor to main dispatch queue operations without

hborla · hborla · commit 7dc29a7f54f4 · 2024-03-21T19:59:15.000-07:00
considering `Sendable`.
diff --git a/lib/Sema/TypeCheckConcurrency.cpp b/lib/Sema/TypeCheckConcurrency.cpp
@@ -6050,6 +6050,7 @@ swift::isDispatchQueueOperationName(StringRef name) {
       .Case("sync", DispatchQueueOperation::Normal)
       .Case("async", DispatchQueueOperation::Sendable)
       .Case("asyncAndWait", DispatchQueueOperation::Normal)
+      .Case("asyncUnsafe", DispatchQueueOperation::Normal)
       .Case("asyncAfter", DispatchQueueOperation::Sendable)
       .Case("concurrentPerform", DispatchQueueOperation::Sendable)
       .Default(std::nullopt);
@@ -6147,8 +6148,7 @@ static AnyFunctionType *applyUnsafeConcurrencyToFunctionType(
     // @MainActor occurs in concurrency contexts or those where we have an
     // application.
     bool addSendable = knownUnsafeParams && inConcurrencyContext;
-    bool addMainActor =
-        (isMainDispatchQueue && knownUnsafeParams) &&
+    bool addMainActor = isMainDispatchQueue &&
         (inConcurrencyContext || numApplies >= 1);
     Type newParamType = param.getPlainType();
     if (addSendable || addMainActor) {
diff --git a/test/Concurrency/dispatch_inference.swift b/test/Concurrency/dispatch_inference.swift
@@ -17,6 +17,10 @@ func testMe() {
   DispatchQueue.main.async {
     onlyOnMainActor() // okay, due to inference of @MainActor-ness
   }
+
+  DispatchQueue.main.sync {
+    onlyOnMainActor()
+  }
 }
 
 func testUnsafeSendableInMainAsync() async {

Original file line number	Diff line number	Diff line change
`@@ -17,6 +17,10 @@ func testMe() {`
`17`	`17`	`DispatchQueue.main.async {`
`18`	`18`	`onlyOnMainActor() // okay, due to inference of @MainActor-ness`
`19`	`19`	`}`
	`20`	`+`
	`21`	`+ DispatchQueue.main.sync {`
	`22`	`+ onlyOnMainActor()`
	`23`	`+ }`
`20`	`24`	`}`
`21`	`25`
`22`	`26`	`func testUnsafeSendableInMainAsync() async {`