abi cleanup

Author: ktoso

stdlib/public/Concurrency/CheckedContinuation.swift

@@ -281,9 +281,9 @@ extension CheckedContinuation {
 /// - SeeAlso: `withCheckedThrowingContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeThrowingContinuation(function:_:)`
-@available(SwiftStdlib 5.1, *)
 @inlinable
 @_unavailableInEmbedded
+@available(SwiftStdlib 5.1, *)
 public func withCheckedContinuation<T>(
   isolation: isolated (any Actor)? = #isolation,
   function: String = #function,
@@ -295,14 +295,15 @@ public func withCheckedContinuation<T>(
 }
 
 @available(SwiftStdlib 5.1, *)
+@usableFromInline
 @_unsafeInheritExecutor // ABI compatibility with Swift 5.1
-@inlinable
 @_unavailableInEmbedded
-public func __abi_withCheckedContinuation<T>(
+@_silgen_name("$ss23withCheckedContinuation8function_xSS_yScCyxs5NeverOGXEtYalF")
+internal func __abi_withCheckedContinuation<T>(
   function: String = #function,
   _ body: (CheckedContinuation<T, Never>) -> Void
 ) async -> T {
-  return await __abi_withUnsafeContinuation {
+  return await withUnsafeContinuation {
     body(CheckedContinuation(continuation: $0, function: function))
   }
 }
@@ -336,9 +337,10 @@ public func __abi_withCheckedContinuation<T>(
 /// - SeeAlso: `withCheckedContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeContinuation(function:_:)`
 /// - SeeAlso: `withUnsafeThrowingContinuation(function:_:)`
-@available(SwiftStdlib 5.1, *)
 @inlinable
 @_unavailableInEmbedded
+@available(SwiftStdlib 5.1, *)
+@backDeployed(before: SwiftStdlib 6.0)
 public func withCheckedThrowingContinuation<T>(
   isolation: isolated (any Actor)? = #isolation,
   function: String = #function,
@@ -350,14 +352,15 @@ public func withCheckedThrowingContinuation<T>(
 }
 
 @available(SwiftStdlib 5.1, *)
+@usableFromInline
 @_unsafeInheritExecutor // ABI compatibility with Swift 5.1
-@inlinable
 @_unavailableInEmbedded
-public func __abi_withCheckedThrowingContinuation<T>(
+@_silgen_name("$ss31withCheckedThrowingContinuation8function_xSS_yScCyxs5Error_pGXEtYaKlF")
+internal func __abi_withCheckedThrowingContinuation<T>(
   function: String = #function,
   _ body: (CheckedContinuation<T, Error>) -> Void
 ) async throws -> T {
-  return try await __abi_withUnsafeThrowingContinuation {
+  return try await withUnsafeThrowingContinuation {
     body(CheckedContinuation(continuation: $0, function: function))
   }
 }

stdlib/public/Concurrency/PartialAsyncTask.swift

@@ -608,17 +608,6 @@ public func withUnsafeContinuation<T>(
   }
 }
 
-@available(SwiftStdlib 5.1, *)
-@_unsafeInheritExecutor
-@_alwaysEmitIntoClient
-public func __abi_withUnsafeContinuation<T>(
-  _ fn: (UnsafeContinuation<T, Never>) -> Void
-) async -> T {
-  return await Builtin.withUnsafeContinuation {
-    fn(UnsafeContinuation<T, Never>($0))
-  }
-}
-
 /// Invokes the passed in closure with a unsafe continuation for the current task.
 ///
 /// The body of the closure executes synchronously on the calling task, and once it returns
@@ -655,17 +644,6 @@ public func withUnsafeThrowingContinuation<T>(
   }
 }
 
-@available(SwiftStdlib 5.1, *)
-@_unsafeInheritExecutor
-@_alwaysEmitIntoClient
-public func __abi_withUnsafeThrowingContinuation<T>(
-  _ fn: (UnsafeContinuation<T, Error>) -> Void
-) async throws -> T {
-  return try await Builtin.withUnsafeThrowingContinuation {
-    fn(UnsafeContinuation<T, Error>($0))
-  }
-}
-
 /// A hack to mark an SDK that supports swift_continuation_await.
 @available(SwiftStdlib 5.1, *)
 @_alwaysEmitIntoClient

test/abi/macOS/arm64/concurrency.swift

@@ -270,6 +270,14 @@ Added: _swift_task_getPreferredTaskExecutor
 Added: _swift_task_popTaskExecutorPreference
 Added: _swift_task_pushTaskExecutorPreference
 
+// Adopt #isolation in with...Continuation APIs
+// Swift.withCheckedThrowingContinuation<A>(isolation: isolated Swift.Actor?, function: Swift.String, _: (Swift.CheckedContinuation<A, Swift.Error>) -> ()) async throws -> A
+Added: _$ss31withCheckedThrowingContinuation9isolation8function_xScA_pSgYi_SSyScCyxs5Error_pGXEtYaKlF
+Added: _$ss31withCheckedThrowingContinuation9isolation8function_xScA_pSgYi_SSyScCyxs5Error_pGXEtYaKlFTu
+// Swift.withCheckedContinuation<A>(isolation: isolated Swift.Actor?, function: Swift.String, _: (Swift.CheckedContinuation<A, Swift.Never>) -> ()) async -> A
+Added: _$ss23withCheckedContinuation9isolation8function_xScA_pSgYi_SSyScCyxs5NeverOGXEtYalF
+Added: _$ss23withCheckedContinuation9isolation8function_xScA_pSgYi_SSyScCyxs5NeverOGXEtYalFTu
+
 // Updated signature for withTaskExecutorPreference to used typed throws and #isolation
 // Swift.withTaskExecutorPreference<A, B where B: Swift.Error>(_: Swift.TaskExecutor?, isolation: isolated Swift.Actor?, operation: () async throws(B) -> A) async throws(B) -> A
 Added: _$ss26withTaskExecutorPreference_9isolation9operationxSch_pSg_ScA_pSgYixyYaq_YKXEtYaq_YKs5ErrorR_r0_lF

test/api-digester/stability-concurrency-abi.test

@@ -78,6 +78,10 @@ Protocol SerialExecutor has added inherited protocol Copyable
 Protocol SerialExecutor has added inherited protocol Escapable
 Protocol AsyncSequence is now without @rethrows
 
+// #isolated was adopted and the old methods kept: $ss31withCheckedThrowingContinuation8function_xSS_yScCyxs5Error_pGXEtYaKlF
+Func withCheckedContinuation(function:_:) has been renamed to Func withCheckedContinuation(isolation:function:_:)
+Func withCheckedContinuation(function:_:) has mangled name changing from '_Concurrency.withCheckedContinuation<A>(function: Swift.String, _: (Swift.CheckedContinuation<A, Swift.Never>) -> ()) async -> A' to '_Concurrency.withCheckedContinuation<A>(isolation: isolated Swift.Optional<Swift.Actor>, function: Swift.String, _: (Swift.CheckedContinuation<A, Swift.Never>) -> ()) async -> A'
+
 // SerialExecutor gained `enqueue(_: __owned Job)`, protocol requirements got default implementations
 Func SerialExecutor.enqueue(_:) has been added as a protocol requirement