Merge pull request #70971 from kubamracek/tt-withunsafeptr

Adopt typed throws in one withUnsafePointer() API

Author: kubamracek

stdlib/public/core/LifetimeManager.swift

@@ -99,7 +99,6 @@ public func _withUnprotectedUnsafeMutablePointer<T, Result>(
 #endif
 }
 
-#if !$Embedded
 /// Invokes the given closure with a pointer to the given argument.
 ///
 /// The `withUnsafePointer(to:_:)` function is useful for calling Objective-C
@@ -120,25 +119,27 @@ public func _withUnprotectedUnsafeMutablePointer<T, Result>(
 ///     type. If you need to mutate the argument through the pointer, use
 ///     `withUnsafeMutablePointer(to:_:)` instead.
 /// - Returns: The return value, if any, of the `body` closure.
+@_alwaysEmitIntoClient
 @inlinable
-public func withUnsafePointer<T, Result>(
+public func withUnsafePointer<T, E, Result>(
   to value: T,
-  _ body: (UnsafePointer<T>) throws -> Result
-) rethrows -> Result
+  _ body: (UnsafePointer<T>) throws(E) -> Result
+) throws(E) -> Result
 {
   return try body(UnsafePointer<T>(Builtin.addressOfBorrow(value)))
 }
-#else
-// TODO: This should be unified with non-embedded Swift.
-@inlinable
-public func withUnsafePointer<T, E, Result>(
+
+/// ABI: Historical withUnsafePointer(to:_:) rethrows, expressed as "throws",
+/// which is ABI-compatible with "rethrows".
+@_silgen_name("$ss17withUnsafePointer2to_q_x_q_SPyxGKXEtKr0_lF")
+@usableFromInline
+func __abi_withUnsafePointer<T, Result>(
   to value: T,
-  _ body: (UnsafePointer<T>) throws(E) -> Result
-) throws(E) -> Result
+  _ body: (UnsafePointer<T>) throws -> Result
+) throws -> Result
 {
   return try body(UnsafePointer<T>(Builtin.addressOfBorrow(value)))
 }
-#endif
 
 /// Invokes the given closure with a pointer to the given argument.
 ///

test/api-digester/Outputs/stability-stdlib-source-x86_64.swift.expected

@@ -41,6 +41,8 @@ Func Collection.map(_:) is now without @rethrows
 Func Sequence.map(_:) has generic signature change from <Self, T where Self : Swift.Sequence> to <Self, T, E where Self : Swift.Sequence, E : Swift.Error>
 Func Sequence.map(_:) is now without @rethrows
 Constructor Result.init(catching:) has generic signature change from <Success, Failure where Failure == any Swift.Error> to <Success, Failure where Failure : Swift.Error>
+Func withUnsafePointer(to:_:) has generic signature change from <T, Result> to <T, E, Result where E : Swift.Error>
+Func withUnsafePointer(to:_:) is now without @rethrows
 Func withoutActuallyEscaping(_:do:) has generic signature change from <ClosureType, ResultType> to <ClosureType, ResultType, Failure where Failure : Swift.Error>
 Func withoutActuallyEscaping(_:do:) is now without @rethrows
 

test/api-digester/stability-stdlib-abi-without-asserts.test

@@ -99,6 +99,9 @@ Constructor Result.init(__abi_catching:) is a new API without @available attribu
 Constructor Result.init(catching:) has been removed
 Func Result.get() has been renamed to Func __abi_get()
 Func Result.get() has mangled name changing from 'Swift.Result.get() throws -> A' to 'Swift.Result.__abi_get() throws -> A'
+Func withUnsafePointer(to:_:) has been renamed to Func __abi_withUnsafePointer(to:_:)
+Func withUnsafePointer(to:_:) has mangled name changing from 'Swift.withUnsafePointer<A, B>(to: A, _: (Swift.UnsafePointer<A>) throws -> B) throws -> B' to 'Swift.__abi_withUnsafePointer<A, B>(to: A, _: (Swift.UnsafePointer<A>) throws -> B) throws -> B'
+Func withUnsafePointer(to:_:) is now without @rethrows
 Func withoutActuallyEscaping(_:do:) has been renamed to Func __abi_withoutActuallyEscaping(_:do:)
 Func withoutActuallyEscaping(_:do:) has mangled name changing from 'Swift.withoutActuallyEscaping<A, B>(_: A, do: (A) throws -> B) throws -> B' to 'Swift.__abi_withoutActuallyEscaping<A, B>(_: A, do: (A) throws -> B) throws -> B'
 Func withoutActuallyEscaping(_:do:) is now without @rethrows