Only enable MainActor for WASI with Embedded Swift

Author: MaxDesiatov

stdlib/public/Concurrency/CMakeLists.txt

@@ -171,8 +171,7 @@ set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES
 
 set(SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES)
 set(SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_SWIFT_SOURCES)
-set(SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_C_SOURCES
-)
+set(SWIFT_RUNTIME_CONCURRENCY_NONEMBEDDED_C_SOURCES)
 
 if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")
   set(SWIFT_RUNTIME_CONCURRENCY_EXECUTOR_SOURCES
@@ -322,7 +321,6 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       )
     endif()
 
-
     set(SWIFT_SDK_embedded_THREADING_PACKAGE none)
     set(SWIFT_SDK_embedded_ARCH_${arch}_MODULE "${mod}")
     set(SWIFT_SDK_embedded_ARCH_${mod}_MODULE "${mod}")

stdlib/public/Concurrency/Executor.swift

@@ -610,7 +610,7 @@ func _createDefaultExecutors() {
   }
 }
 
-#if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
+#if os(WASI) || (!$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY)
 extension MainActor {
   @available(StdlibDeploymentTarget 6.2, *)
   static var _executor: (any MainExecutor)? = nil
@@ -627,7 +627,7 @@ extension MainActor {
     return _executor!
   }
 }
-#endif // !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
+#endif // os(WASI) || (!$Embedded && !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY)
 
 extension Task where Success == Never, Failure == Never {
   @available(StdlibDeploymentTarget 6.2, *)

stdlib/public/Concurrency/ExecutorBridge.swift

@@ -91,6 +91,7 @@ internal func _jobGetExecutorPrivateData(
   _ job: Builtin.Job
 ) -> UnsafeMutableRawPointer
 
+#if os(WASI) || !$Embedded
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 @available(StdlibDeploymentTarget 6.2, *)
 @_silgen_name("swift_getMainExecutor")
@@ -103,6 +104,7 @@ internal func _getMainExecutorAsSerialExecutor() -> (any SerialExecutor)? {
 @_silgen_name("swift_getMainExecutor")
 internal func _getMainExecutorAsSerialExecutor() -> (any SerialExecutor)?
 #endif // SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
+#endif // os(WASI) || !$Embedded
 
 @available(StdlibDeploymentTarget 6.2, *)
 @_silgen_name("swift_dispatchMain")

stdlib/public/Concurrency/MainActor.swift

@@ -12,6 +12,8 @@
 
 import Swift
 
+#if os(WASI) || !$Embedded
+
 #if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 @available(SwiftStdlib 5.1, *)
 @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
@@ -195,3 +197,4 @@ public func _deinitOnExecutorMainActorBackDeploy(
 
 #endif // !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 
+#endif // os(WASI) || !$Embedded