Merge pull request #65777 from tshortli/clean-up-back-deployed-concurrency-apis

Concurrency: Revert workarounds for `@backDeployed` condfails

Author: tshortli

stdlib/public/BackDeployConcurrency/TaskCancellation.swift

@@ -38,22 +38,17 @@ import Swift
 /// the operation gets to run.
 @_unsafeInheritExecutor // the operation runs on the same executor as we start out with
 @available(SwiftStdlib 5.1, *)
-@_backDeploy(before: SwiftStdlib 5.8)
+@backDeployed(before: SwiftStdlib 5.8)
 public func withTaskCancellationHandler<T>(
   operation: () async throws -> T,
   onCancel handler: @Sendable () -> Void
 ) async rethrows -> T {
   // unconditionally add the cancellation record to the task.
   // if the task was already cancelled, it will be executed right away.
   let record = _taskAddCancellationHandler(handler: handler)
-  do {
-    let result = try await operation()
-    _taskRemoveCancellationHandler(record: record)
-    return result
-  } catch {
-    _taskRemoveCancellationHandler(record: record)
-    throw error
-  }
+  defer { _taskRemoveCancellationHandler(record: record) }
+
+  return try await operation()
 }
 
 @available(SwiftStdlib 5.1, *)

stdlib/public/BackDeployConcurrency/TaskLocal.swift

@@ -135,10 +135,10 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   ///
   /// If the value is a reference type, it will be retained for the duration of
   /// the operation closure.
+  @inlinable
   @discardableResult
   @_unsafeInheritExecutor
-  @available(SwiftStdlib 5.1, *) // back deploy requires we declare the availability explicitly on this method
-  @_backDeploy(before: SwiftStdlib 5.8)
+  @backDeployed(before: SwiftStdlib 5.8)
   public func withValue<R>(_ valueDuringOperation: Value, operation: () async throws -> R,
                            file: String = #file, line: UInt = #line) async rethrows -> R {
     return try await withValueImpl(valueDuringOperation, operation: operation, file: file, line: line)
@@ -165,8 +165,7 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   @inlinable
   @discardableResult
   @_unsafeInheritExecutor
-  @available(SwiftStdlib 5.1, *) // back deploy requires we declare the availability explicitly on this method
-  @_backDeploy(before: SwiftStdlib 5.9)
+  @backDeployed(before: SwiftStdlib 5.9)
   internal func withValueImpl<R>(_ valueDuringOperation: __owned Value, operation: () async throws -> R,
                                  file: String = #fileID, line: UInt = #line) async rethrows -> R {
     // check if we're not trying to bind a value from an illegal context; this may crash

stdlib/public/Concurrency/TaskCancellation.swift

@@ -38,22 +38,17 @@ import Swift
 /// the operation gets to run.
 @_unsafeInheritExecutor // the operation runs on the same executor as we start out with
 @available(SwiftStdlib 5.1, *)
-@_backDeploy(before: SwiftStdlib 5.8)
+@backDeployed(before: SwiftStdlib 5.8)
 public func withTaskCancellationHandler<T>(
   operation: () async throws -> T,
   onCancel handler: @Sendable () -> Void
 ) async rethrows -> T {
   // unconditionally add the cancellation record to the task.
   // if the task was already cancelled, it will be executed right away.
   let record = _taskAddCancellationHandler(handler: handler)
-  do {
-    let result = try await operation()
-    _taskRemoveCancellationHandler(record: record)
-    return result
-  } catch {
-    _taskRemoveCancellationHandler(record: record)
-    throw error
-  }
+  defer { _taskRemoveCancellationHandler(record: record) }
+
+  return try await operation()
 }
 
 @available(SwiftStdlib 5.1, *)

stdlib/public/Concurrency/TaskLocal.swift

@@ -135,10 +135,10 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   ///
   /// If the value is a reference type, it will be retained for the duration of
   /// the operation closure.
+  @inlinable
   @discardableResult
   @_unsafeInheritExecutor
-  @available(SwiftStdlib 5.1, *) // back deploy requires we declare the availability explicitly on this method
-  @_backDeploy(before: SwiftStdlib 5.8)
+  @backDeployed(before: SwiftStdlib 5.8)
   public func withValue<R>(_ valueDuringOperation: Value, operation: () async throws -> R,
                            file: String = #fileID, line: UInt = #line) async rethrows -> R {
     return try await withValueImpl(valueDuringOperation, operation: operation, file: file, line: line)
@@ -165,8 +165,7 @@ public final class TaskLocal<Value: Sendable>: Sendable, CustomStringConvertible
   @inlinable
   @discardableResult
   @_unsafeInheritExecutor
-  @available(SwiftStdlib 5.1, *) // back deploy requires we declare the availability explicitly on this method
-  @_backDeploy(before: SwiftStdlib 5.9)
+  @backDeployed(before: SwiftStdlib 5.9)
   internal func withValueImpl<R>(_ valueDuringOperation: __owned Value, operation: () async throws -> R,
                                  file: String = #fileID, line: UInt = #line) async rethrows -> R {
     // check if we're not trying to bind a value from an illegal context; this may crash

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

@@ -31,8 +31,7 @@
 // false positives, or if you have special permission to break things.) You can
 // find a diff of what needs to be added in the output of the failed test run.
 // The order of lines doesn't matter, and you can also include comments to refer
-// to any bugs you filed. Remember that in almost all cases you'll want to edit
-// the stability-stdlib-abi-without-asserts.test file instead of this one.
+// to any bugs you filed.
 //
 // Thank you for your help ensuring the stdlib remains compatible with its past!
 //                                            -- Your friendly stdlib engineers
@@ -72,4 +71,7 @@ Func SerialExecutor.enqueue(_:) has been added as a protocol requirement
 // rdar://106833284 (ABI checker confused with overload getting deprecated)
 Func Executor.enqueue(_:) is a new API without @available attribute
 
+// This function correctly inherits its availability from the TaskLocal struct.
+Func TaskLocal.withValueImpl(_:operation:file:line:) is a new API without @available attribute
+
 // *** DO NOT DISABLE OR XFAIL THIS TEST. *** (See comment above.)