[Concurrency] Fix some warnings, use typed throws.

al45tair · al45tair · commit 0da95eb20d8d · 2025-03-18T18:37:31.000Z
Fix a couple of `unsafe` warnings.

Also update `withUnsafeExecutorPrivateData` to use typed throws instead of
`rethrow`.

rdar://141348916
diff --git a/stdlib/public/Concurrency/CooperativeExecutor.swift b/stdlib/public/Concurrency/CooperativeExecutor.swift
@@ -74,9 +74,9 @@ extension ExecutorJob {
       let ptr: UnsafeMutablePointer<CooperativeExecutor.Timestamp>
       // Try to use the task allocator if it has one
       if let allocator {
-        ptr = unsafe allocator.allocate(as: CooperativeExecutor.Timestamp.self)
+        unsafe ptr = allocator.allocate(as: CooperativeExecutor.Timestamp.self)
       } else {
-        ptr = .allocate(capacity: 1)
+        unsafe ptr = .allocate(capacity: 1)
       }
       unsafe self.cooperativeExecutorTimestampPointer = ptr
     }
diff --git a/stdlib/public/Concurrency/PartialAsyncTask.swift b/stdlib/public/Concurrency/PartialAsyncTask.swift
@@ -323,7 +323,7 @@ public struct ExecutorJob: Sendable, ~Copyable {
   ///
   /// Returns the result of executing the closure.
   @available(SwiftStdlib 6.2, *)
-  public func withUnsafeExecutorPrivateData<R>(body: (UnsafeMutableRawBufferPointer) throws -> R) rethrows -> R {
+  public func withUnsafeExecutorPrivateData<R, E>(body: (UnsafeMutableRawBufferPointer) throws(E) -> R) throws(E) -> R {
     let base = unsafe _jobGetExecutorPrivateData(self.context)
     let size = unsafe 2 * MemoryLayout<OpaquePointer>.stride
     return unsafe try body(UnsafeMutableRawBufferPointer(start: base,
diff --git a/test/abi/Inputs/macOS/arm64/concurrency/baseline-asserts b/test/abi/Inputs/macOS/arm64/concurrency/baseline-asserts
@@ -410,7 +410,7 @@ _$ss11ClockTraitsVSYsMc
 _$ss11ClockTraitsVs10SetAlgebrasMc
 _$ss11ClockTraitsVs25ExpressibleByArrayLiteralsMc
 _$ss11ClockTraitsVs9OptionSetsMc
-_$ss11ExecutorJobV010withUnsafeA11PrivateData4bodyxxSwKXE_tKlF
+_$ss11ExecutorJobV010withUnsafeA11PrivateData4bodyxxSwq_YKXE_tq_YKs5ErrorR_r0_lF
 _$ss11ExecutorJobV11descriptionSSvg
 _$ss11ExecutorJobV14LocalAllocatorV10deallocateyySpyxGlF
 _$ss11ExecutorJobV14LocalAllocatorV10deallocateyySryxGlF
diff --git a/test/abi/Inputs/macOS/x86_64/concurrency/baseline-asserts b/test/abi/Inputs/macOS/x86_64/concurrency/baseline-asserts
@@ -410,7 +410,7 @@ _$ss11ClockTraitsVSYsMc
 _$ss11ClockTraitsVs10SetAlgebrasMc
 _$ss11ClockTraitsVs25ExpressibleByArrayLiteralsMc
 _$ss11ClockTraitsVs9OptionSetsMc
-_$ss11ExecutorJobV010withUnsafeA11PrivateData4bodyxxSwKXE_tKlF
+_$ss11ExecutorJobV010withUnsafeA11PrivateData4bodyxxSwq_YKXE_tq_YKs5ErrorR_r0_lF
 _$ss11ExecutorJobV11descriptionSSvg
 _$ss11ExecutorJobV14LocalAllocatorV10deallocateyySpyxGlF
 _$ss11ExecutorJobV14LocalAllocatorV10deallocateyySryxGlF

Original file line number	Diff line number	Diff line change
`@@ -74,9 +74,9 @@ extension ExecutorJob {`
`74`	`74`	`let ptr: UnsafeMutablePointer<CooperativeExecutor.Timestamp>`
`75`	`75`	`// Try to use the task allocator if it has one`
`76`	`76`	`if let allocator {`
`77`		`- ptr = unsafe allocator.allocate(as: CooperativeExecutor.Timestamp.self)`
	`77`	`+ unsafe ptr = allocator.allocate(as: CooperativeExecutor.Timestamp.self)`
`78`	`78`	`} else {`
`79`		`- ptr = .allocate(capacity: 1)`
	`79`	`+ unsafe ptr = .allocate(capacity: 1)`
`80`	`80`	`}`
`81`	`81`	`unsafe self.cooperativeExecutorTimestampPointer = ptr`
`82`	`82`	`}`