Merge pull request #76760 from kubamracek/embedded-asyncstream

kubamracek · web-flow · commit 762e7898de22 · 2024-10-02T22:23:17.000-07:00
[Concurrency] Include more pieces of Concurrency in Embedded (AsyncStream, continuations)
diff --git a/stdlib/public/Concurrency/CMakeLists.txt b/stdlib/public/Concurrency/CMakeLists.txt
@@ -263,39 +263,13 @@ if(SWIFT_SHOULD_BUILD_EMBEDDED_STDLIB AND SWIFT_SHOULD_BUILD_EMBEDDED_CONCURRENC
       IS_STDLIB IS_FRAGILE
 
       ${SWIFT_RUNTIME_CONCURRENCY_C_SOURCES}
+      ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_SOURCES}
       CooperativeGlobalExecutor.cpp
 
-      # TODO: Only a subset of Swift Concurrency .swift sources, for now.
-      Actor.swift
-      AsyncLet.swift
-      CheckedContinuation.swift
-      Errors.swift
-      Executor.swift
-      ExecutorAssertions.swift
-      AsyncCompactMapSequence.swift
-      AsyncDropFirstSequence.swift
-      AsyncDropWhileSequence.swift
-      AsyncFilterSequence.swift
-      AsyncFlatMapSequence.swift
-      AsyncIteratorProtocol.swift
-      AsyncMapSequence.swift
-      AsyncPrefixSequence.swift
-      AsyncPrefixWhileSequence.swift
-      AsyncSequence.swift
-      AsyncThrowingCompactMapSequence.swift
-      AsyncThrowingDropWhileSequence.swift
-      AsyncThrowingFilterSequence.swift
-      AsyncThrowingFlatMapSequence.swift
-      AsyncThrowingMapSequence.swift
-      AsyncThrowingPrefixWhileSequence.swift
-      GlobalActor.swift
-      PartialAsyncTask.swift
-      Task.swift
-      TaskCancellation.swift
-
       SWIFT_COMPILE_FLAGS
         ${extra_swift_compile_flags} -enable-experimental-feature Embedded
         -parse-stdlib -DSWIFT_CONCURRENCY_EMBEDDED
+        -Xfrontend -emit-empty-object-file
         ${SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS}
       C_COMPILE_FLAGS
         ${extra_c_compile_flags} ${SWIFT_RUNTIME_CONCURRENCY_C_FLAGS} -DSWIFT_CONCURRENCY_EMBEDDED=1
diff --git a/stdlib/public/Concurrency/CheckedContinuation.swift b/stdlib/public/Concurrency/CheckedContinuation.swift
@@ -19,16 +19,15 @@ internal func logFailedCheck(_ message: UnsafeRawPointer)
 /// Implementation class that holds the `UnsafeContinuation` instance for
 /// a `CheckedContinuation`.
 @available(SwiftStdlib 5.1, *)
-@_unavailableInEmbedded
 internal final class CheckedContinuationCanary: @unchecked Sendable {
   // The instance state is stored in tail-allocated raw memory, so that
   // we can atomically check the continuation state.
 
   private init() { fatalError("must use create") }
 
   private static func _create(continuation: UnsafeRawPointer, function: String)
-      -> Self {
-    let instance = Builtin.allocWithTailElems_1(self,
+      -> CheckedContinuationCanary {
+    let instance = Builtin.allocWithTailElems_1(CheckedContinuationCanary.self,
       1._builtinWordValue,
       (UnsafeRawPointer?, String).self)
 
@@ -52,7 +51,7 @@ internal final class CheckedContinuationCanary: @unchecked Sendable {
   }
 
   internal static func create<T, E>(continuation: UnsafeContinuation<T, E>,
-                                 function: String) -> Self {
+                                 function: String) -> CheckedContinuationCanary {
     return _create(
         continuation: unsafeBitCast(continuation, to: UnsafeRawPointer.self),
         function: function)
@@ -79,7 +78,11 @@ internal final class CheckedContinuationCanary: @unchecked Sendable {
     // Log if the continuation was never consumed before the instance was
     // destructed.
     if _continuationPtr.pointee != nil {
+      #if !$Embedded
       logFailedCheck("SWIFT TASK CONTINUATION MISUSE: \(function) leaked its continuation without resuming it. This may cause tasks waiting on it to remain suspended forever.\n")
+      #else
+      fatalError("SWIFT TASK CONTINUATION MISUSE")
+      #endif
     }
   }
 }
@@ -120,7 +123,6 @@ internal final class CheckedContinuationCanary: @unchecked Sendable {
 /// you can replace one with the other in most circumstances,
 /// without making other changes.
 @available(SwiftStdlib 5.1, *)
-@_unavailableInEmbedded
 public struct CheckedContinuation<T, E: Error>: Sendable {
   private let canary: CheckedContinuationCanary
   
@@ -163,7 +165,11 @@ public struct CheckedContinuation<T, E: Error>: Sendable {
     if let c: UnsafeContinuation<T, E> = canary.takeContinuation() {
       c.resume(returning: value)
     } else {
+      #if !$Embedded
       fatalError("SWIFT TASK CONTINUATION MISUSE: \(canary.function) tried to resume its continuation more than once, returning \(value)!\n")
+      #else
+      fatalError("SWIFT TASK CONTINUATION MISUSE")
+      #endif
     }
   }
   
@@ -183,13 +189,16 @@ public struct CheckedContinuation<T, E: Error>: Sendable {
     if let c: UnsafeContinuation<T, E> = canary.takeContinuation() {
       c.resume(throwing: error)
     } else {
+      #if !$Embedded
       fatalError("SWIFT TASK CONTINUATION MISUSE: \(canary.function) tried to resume its continuation more than once, throwing \(error)!\n")
+      #else
+      fatalError("SWIFT TASK CONTINUATION MISUSE")
+      #endif
     }
   }
 }
 
 @available(SwiftStdlib 5.1, *)
-@_unavailableInEmbedded
 extension CheckedContinuation {
   /// Resume the task awaiting the continuation by having it either
   /// return normally or throw an error based on the state of the given
@@ -282,7 +291,6 @@ extension CheckedContinuation {
 /// - SeeAlso: `withUnsafeContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeThrowingContinuation(function:_:)`
 @inlinable
-@_unavailableInEmbedded
 @available(SwiftStdlib 5.1, *)
 #if !$Embedded
 @backDeployed(before: SwiftStdlib 6.0)
@@ -307,7 +315,6 @@ public func withCheckedContinuation<T>(
 // introduction of #isolation.
 @available(SwiftStdlib 5.1, *)
 @_unsafeInheritExecutor // ABI compatibility with Swift 5.1
-@_unavailableInEmbedded
 @_silgen_name("$ss23withCheckedContinuation8function_xSS_yScCyxs5NeverOGXEtYalF")
 public func _unsafeInheritExecutor_withCheckedContinuation<T>(
   function: String = #function,
@@ -348,7 +355,6 @@ public func _unsafeInheritExecutor_withCheckedContinuation<T>(
 /// - SeeAlso: `withUnsafeContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeThrowingContinuation(function:_:)`
 @inlinable
-@_unavailableInEmbedded
 @available(SwiftStdlib 5.1, *)
 #if !$Embedded
 @backDeployed(before: SwiftStdlib 6.0)
@@ -373,7 +379,6 @@ public func withCheckedThrowingContinuation<T>(
 // introduction of #isolation.
 @available(SwiftStdlib 5.1, *)
 @_unsafeInheritExecutor // ABI compatibility with Swift 5.1
-@_unavailableInEmbedded
 @_silgen_name("$ss31withCheckedThrowingContinuation8function_xSS_yScCyxs5Error_pGXEtYaKlF")
 public func _unsafeInheritExecutor_withCheckedThrowingContinuation<T>(
   function: String = #function,
diff --git a/stdlib/public/Concurrency/ContinuousClock.swift b/stdlib/public/Concurrency/ContinuousClock.swift
@@ -11,6 +11,7 @@
 //===----------------------------------------------------------------------===//
 import Swift
 
+#if !$Embedded
 /// A clock that measures time that always increments and does not stop 
 /// incrementing while the system is asleep. 
 ///
@@ -33,6 +34,7 @@ public struct ContinuousClock: Sendable {
 
   public init() { }
 }
+#endif
 
 @available(SwiftStdlib 5.7, *)
 extension Duration {
@@ -49,6 +51,8 @@ extension Duration {
   }
 }
 
+#if !$Embedded
+
 @available(SwiftStdlib 5.7, *)
 extension Clock where Self == ContinuousClock {
   /// A clock that measures time that always increments but does not stop 
@@ -189,3 +193,5 @@ extension ContinuousClock.Instant: InstantProtocol {
     rhs.duration(to: lhs)
   }
 }
+
+#endif
diff --git a/stdlib/public/Concurrency/Deque/Deque+Codable.swift b/stdlib/public/Concurrency/Deque/Deque+Codable.swift
@@ -14,6 +14,8 @@
 
 import Swift
 
+#if !$Embedded
+
 extension _Deque: Encodable where Element: Encodable {
   /// Encodes the elements of this deque into the given encoder in an unkeyed
   /// container.
@@ -50,3 +52,5 @@ extension _Deque: Decodable where Element: Decodable {
     }
   }
 }
+
+#endif
diff --git a/stdlib/public/Concurrency/Deque/Deque+CustomDebugStringConvertible.swift b/stdlib/public/Concurrency/Deque/Deque+CustomDebugStringConvertible.swift
@@ -12,7 +12,8 @@
 /// This file is copied from swift-collections and should not be modified here.
 /// Rather all changes should be made to swift-collections and copied back.
 
-#if !SWIFT_STDLIB_STATIC_PRINT
+#if !SWIFT_STDLIB_STATIC_PRINT && !$Embedded
+
 import Swift
 
 extension _Deque: CustomDebugStringConvertible {
@@ -32,4 +33,5 @@ extension _Deque: CustomDebugStringConvertible {
     return result
   }
 }
-#endif
+
+#endif
diff --git a/stdlib/public/Concurrency/Deque/Deque+CustomStringConvertible.swift b/stdlib/public/Concurrency/Deque/Deque+CustomStringConvertible.swift
@@ -12,7 +12,8 @@
 /// This file is copied from swift-collections and should not be modified here.
 /// Rather all changes should be made to swift-collections and copied back.
 
-#if !SWIFT_STDLIB_STATIC_PRINT
+#if !SWIFT_STDLIB_STATIC_PRINT && !$Embedded
+
 import Swift
 
 extension _Deque: CustomStringConvertible {
@@ -32,4 +33,5 @@ extension _Deque: CustomStringConvertible {
     return result
   }
 }
-#endif
+
+#endif
diff --git a/stdlib/public/Concurrency/GlobalConcurrentExecutor.swift b/stdlib/public/Concurrency/GlobalConcurrentExecutor.swift
@@ -31,6 +31,7 @@ import Swift
 ///
 /// Customizing the global concurrent executor is currently not supported.
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 public var globalConcurrentExecutor: any TaskExecutor {
   get {
     _DefaultGlobalConcurrentExecutor.shared
@@ -43,6 +44,7 @@ public var globalConcurrentExecutor: any TaskExecutor {
 /// thread pool that is used as the default executor for Swift concurrency
 /// tasks.
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 internal final class _DefaultGlobalConcurrentExecutor: TaskExecutor {
   public static let shared: _DefaultGlobalConcurrentExecutor = .init()
 
diff --git a/stdlib/public/Concurrency/MainActor.swift b/stdlib/public/Concurrency/MainActor.swift
@@ -12,6 +12,8 @@
 
 import Swift
 
+#if !$Embedded
+
 #if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 @available(SwiftStdlib 5.1, *)
 @available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")
@@ -157,3 +159,5 @@ extension MainActor {
   }
 }
 #endif
+
+#endif
diff --git a/stdlib/public/Concurrency/SuspendingClock.swift b/stdlib/public/Concurrency/SuspendingClock.swift
@@ -11,6 +11,8 @@
 //===----------------------------------------------------------------------===//
 import Swift
 
+#if !$Embedded
+
 /// A clock that measures time that always increments but stops incrementing 
 /// while the system is asleep. 
 ///
@@ -179,3 +181,4 @@ extension SuspendingClock.Instant: InstantProtocol {
   }
 }
 
+#endif
diff --git a/stdlib/public/Concurrency/Task+TaskExecutor.swift b/stdlib/public/Concurrency/Task+TaskExecutor.swift
@@ -190,6 +190,7 @@ public func _unsafeInheritExecutor_withTaskExecutorPreference<T: Sendable>(
 /// Task with specified executor -----------------------------------------------
 
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 extension Task where Failure == Never {
   /// Runs the given nonthrowing operation asynchronously
   /// as part of a new top-level task on behalf of the current actor.
@@ -257,6 +258,7 @@ extension Task where Failure == Never {
 }
 
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 extension Task where Failure == Error {
   /// Runs the given throwing operation asynchronously
   /// as part of a new top-level task on behalf of the current actor.
@@ -321,6 +323,7 @@ extension Task where Failure == Error {
 // ==== Detached tasks ---------------------------------------------------------
 
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 extension Task where Failure == Never {
   /// Runs the given nonthrowing operation asynchronously
   /// as part of a new top-level task.
@@ -379,6 +382,7 @@ extension Task where Failure == Never {
 }
 
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 extension Task where Failure == Error {
   /// Runs the given throwing operation asynchronously
   /// as part of a new top-level task.
@@ -441,6 +445,7 @@ extension Task where Failure == Error {
 // ==== Unsafe Current Task ----------------------------------------------------
 
 @available(SwiftStdlib 6.0, *)
+@_unavailableInEmbedded
 extension UnsafeCurrentTask {
 
   /// The current ``TaskExecutor`` preference, if this task has one configured.
diff --git a/stdlib/public/Concurrency/Task.cpp b/stdlib/public/Concurrency/Task.cpp
@@ -1402,6 +1402,7 @@ static LazyMutex ActiveContinuationsLock;
 static Lazy<std::unordered_set<AsyncTask *>> ActiveContinuations;
 
 static bool isEnabled() {
+#if !SWIFT_CONCURRENCY_EMBEDDED
   auto state = CurrentState.load(std::memory_order_relaxed);
   if (state == State::Uninitialized) {
     bool enabled =
@@ -1410,6 +1411,9 @@ static bool isEnabled() {
     CurrentState.store(state, std::memory_order_relaxed);
   }
   return state == State::On;
+#else
+  return false;
+#endif
 }
 
 static void init(AsyncTask *task) {
diff --git a/stdlib/public/Concurrency/TaskCancellation.swift b/stdlib/public/Concurrency/TaskCancellation.swift
@@ -67,7 +67,9 @@ import Swift
 /// Therefore, if a cancellation handler must acquire a lock, other code should
 /// not cancel tasks or resume continuations while holding that lock.
 @available(SwiftStdlib 5.1, *)
+#if !$Embedded
 @backDeployed(before: SwiftStdlib 6.0)
+#endif
 public func withTaskCancellationHandler<T>(
   operation: () async throws -> T,
   onCancel handler: @Sendable () -> Void,
diff --git a/stdlib/public/Concurrency/TaskSleep.swift b/stdlib/public/Concurrency/TaskSleep.swift
@@ -14,6 +14,7 @@ import Swift
 
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 @available(SwiftStdlib 5.1, *)
+@_unavailableInEmbedded
 extension Task where Success == Never, Failure == Never {
   @available(*, deprecated, renamed: "Task.sleep(nanoseconds:)")
   /// Suspends the current task for at least the given duration
diff --git a/stdlib/public/Concurrency/TaskSleepDuration.swift b/stdlib/public/Concurrency/TaskSleepDuration.swift
@@ -14,6 +14,7 @@ import Swift
 
 #if !SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY
 @available(SwiftStdlib 5.7, *)
+@_unavailableInEmbedded
 extension Task where Success == Never, Failure == Never {
   @available(SwiftStdlib 5.7, *)
   internal static func _sleep(
diff --git a/test/embedded/concurrency-continuations.swift b/test/embedded/concurrency-continuations.swift
diff --git a/test/embedded/concurrency-stream.swift b/test/embedded/concurrency-stream.swift
diff --git a/test/embedded/custom-executor.swift b/test/embedded/custom-executor.swift
diff --git a/test/embedded/dependencies-concurrency-custom-executor.swift b/test/embedded/dependencies-concurrency-custom-executor.swift

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@`
`11`	`11`	`//===----------------------------------------------------------------------===//`
`12`	`12`	`import Swift`
`13`	`13`
	`14`	`+#if !$Embedded`
`14`	`15`	`/// A clock that measures time that always increments and does not stop`
`15`	`16`	`/// incrementing while the system is asleep.`
`16`	`17`	`///`
`@@ -33,6 +34,7 @@ public struct ContinuousClock: Sendable {`
`33`	`34`
`34`	`35`	`public init() { }`
`35`	`36`	`}`
	`37`	`+#endif`
`36`	`38`
`37`	`39`	`@available(SwiftStdlib 5.7, *)`
`38`	`40`	`extension Duration {`
`@@ -49,6 +51,8 @@ extension Duration {`
`49`	`51`	`}`
`50`	`52`	`}`
`51`	`53`
	`54`	`+#if !$Embedded`
	`55`	`+`
`52`	`56`	`@available(SwiftStdlib 5.7, *)`
`53`	`57`	`extension Clock where Self == ContinuousClock {`
`54`	`58`	`/// A clock that measures time that always increments but does not stop`
`@@ -189,3 +193,5 @@ extension ContinuousClock.Instant: InstantProtocol {`
`189`	`193`	`rhs.duration(to: lhs)`
`190`	`194`	`}`
`191`	`195`	`}`
	`196`	`+`
	`197`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,8 @@`
`14`	`14`
`15`	`15`	`import Swift`
`16`	`16`
	`17`	`+#if !$Embedded`
	`18`	`+`
`17`	`19`	`extension _Deque: Encodable where Element: Encodable {`
`18`	`20`	`/// Encodes the elements of this deque into the given encoder in an unkeyed`
`19`	`21`	`/// container.`
`@@ -50,3 +52,5 @@ extension _Deque: Decodable where Element: Decodable {`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`	`}`
	`55`	`+`
	`56`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,8 @@`
`12`	`12`	`/// This file is copied from swift-collections and should not be modified here.`
`13`	`13`	`/// Rather all changes should be made to swift-collections and copied back.`
`14`	`14`
`15`		`-#if !SWIFT_STDLIB_STATIC_PRINT`
	`15`	`+#if !SWIFT_STDLIB_STATIC_PRINT && !$Embedded`
	`16`	`+`
`16`	`17`	`import Swift`
`17`	`18`
`18`	`19`	`extension _Deque: CustomDebugStringConvertible {`
`@@ -32,4 +33,5 @@ extension _Deque: CustomDebugStringConvertible {`
`32`	`33`	`return result`
`33`	`34`	`}`
`34`	`35`	`}`
`35`		`-#endif`
	`36`	`+`
	`37`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,8 @@`
`12`	`12`
`13`	`13`	`import Swift`
`14`	`14`
	`15`	`+#if !$Embedded`
	`16`	`+`
`15`	`17`	`#if SWIFT_STDLIB_TASK_TO_THREAD_MODEL_CONCURRENCY`
`16`	`18`	`@available(SwiftStdlib 5.1, *)`
`17`	`19`	`@available(*, unavailable, message: "Unavailable in task-to-thread concurrency model")`
`@@ -157,3 +159,5 @@ extension MainActor {`
`157`	`159`	`}`
`158`	`160`	`}`
`159`	`161`	`#endif`
	`162`	`+`
	`163`	`+#endif`
Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@`
`11`	`11`	`//===----------------------------------------------------------------------===//`
`12`	`12`	`import Swift`
`13`	`13`
	`14`	`+#if !$Embedded`
	`15`	`+`
`14`	`16`	`/// A clock that measures time that always increments but stops incrementing`
`15`	`17`	`/// while the system is asleep.`
`16`	`18`	`///`
`@@ -179,3 +181,4 @@ extension SuspendingClock.Instant: InstantProtocol {`
`179`	`181`	`}`
`180`	`182`	`}`
`181`	`183`
	`184`	`+#endif`