Merge pull request #75067 from tshortli/no-more-typed-throws-condfails

stdlib: Remove `#if $TypedThrows` guards

Author: tshortli

stdlib/public/Concurrency/ExecutorAssertions.swift

@@ -360,16 +360,12 @@ extension Actor {
       fatalError("Incorrect actor executor assumption; Expected same executor as \(self).", file: file, line: line)
     }
 
-    #if $TypedThrows
     // To do the unsafe cast, we have to pretend it's @escaping.
     return try withoutActuallyEscaping(operation) {
       (_ fn: @escaping YesActor) throws -> T in
       let rawFn = unsafeBitCast(fn, to: NoActor.self)
       return try rawFn(self)
     }
-    #else
-    fatalError("unsupported compiler")
-    #endif
   }
 
   @available(SwiftStdlib 5.9, *)

stdlib/public/Concurrency/MainActor.swift

@@ -138,16 +138,12 @@ extension MainActor {
       fatalError("Incorrect actor executor assumption; Expected same executor as \(self).", file: file, line: line)
     }
 
-    #if $TypedThrows
     // To do the unsafe cast, we have to pretend it's @escaping.
     return try withoutActuallyEscaping(operation) {
       (_ fn: @escaping YesActor) throws -> T in
       let rawFn = unsafeBitCast(fn, to: NoActor.self)
       return try rawFn()
     }
-    #else
-    fatalError("unsupported compiler")
-    #endif
   }
 
   @available(SwiftStdlib 5.9, *)

stdlib/public/Distributed/DistributedAssertions.swift

@@ -171,16 +171,12 @@ extension DistributedActor {
       fatalError("Incorrect actor executor assumption; Expected same executor as \(self).", file: file, line: line)
     }
 
-    #if $TypedThrows
     // To do the unsafe cast, we have to pretend it's @escaping.
     return try withoutActuallyEscaping(operation) {
       (_ fn: @escaping YesActor) throws -> T in
       let rawFn = unsafeBitCast(fn, to: NoActor.self)
       return try rawFn(self)
     }
-    #else
-    fatalError("unsupported compiler")
-    #endif
   }
 
   @available(SwiftStdlib 5.9, *)

stdlib/public/core/ArrayCast.swift

@@ -49,11 +49,7 @@ public func _arrayForceCast<SourceElement, TargetElement>(
     return Array(_immutableCocoaArray: source._buffer._asCocoaArray())
   }
 #endif
-#if $TypedThrows
   return source.map { $0 as! TargetElement }
-#else
-  return try! source.__rethrows_map { $0 as! TargetElement }
-#endif
 }
 
 /// Called by the casting machinery.

stdlib/public/core/Collection.swift

@@ -1216,6 +1216,7 @@ extension Collection {
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
+  @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
   @usableFromInline
   @_silgen_name("$sSlsE3mapySayqd__Gqd__7ElementQzKXEKlF")
   func __rethrows_map<T>(

stdlib/public/core/ExistentialCollection.swift

@@ -550,11 +550,7 @@ internal final class _SequenceBox<S: Sequence>: _AnySequenceBox<S.Element> {
   internal override func _map<T>(
     _ transform: (Element) throws -> T
   ) throws -> [T] {
-#if $TypedThrows
     try _base.map(transform)
-#else
-    try _base.__rethrows_map(transform)
-#endif
   }
   @inlinable
   internal override func _filter(
@@ -650,11 +646,7 @@ internal final class _CollectionBox<S: Collection>: _AnyCollectionBox<S.Element>
   internal override func _map<T>(
     _ transform: (Element) throws -> T
   ) throws -> [T] {
-#if $TypedThrows
     try _base.map(transform)
-#else
-    try _base.__rethrows_map(transform)
-#endif
   }
   @inlinable
   internal override func _filter(
@@ -852,11 +844,7 @@ internal final class _BidirectionalCollectionBox<S: BidirectionalCollection>
   internal override func _map<T>(
     _ transform: (Element) throws -> T
   ) throws -> [T] {
-#if $TypedThrows
     try _base.map(transform)
-#else
-    try _base.__rethrows_map(transform)
-#endif
   }
   @inlinable
   internal override func _filter(
@@ -1072,11 +1060,7 @@ internal final class _RandomAccessCollectionBox<S: RandomAccessCollection>
   internal override func _map<T>(
     _ transform: (Element) throws -> T
   ) throws -> [T] {
-#if $TypedThrows
     try _base.map(transform)
-#else
-    try _base.__rethrows_map(transform)
-#endif
   }
   @inlinable
   internal override func _filter(
@@ -1380,6 +1364,7 @@ extension AnySequence {
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
+  @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
   @usableFromInline
   @_silgen_name("$ss11AnySequenceV3mapySayqd__Gqd__xKXEKlF")
   func __rethrows_map<T>(
@@ -1483,6 +1468,7 @@ extension AnyCollection {
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
+  @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
   @usableFromInline
   @_silgen_name("$ss13AnyCollectionV3mapySayqd__Gqd__xKXEKlF")
   func __rethrows_map<T>(
@@ -1592,6 +1578,7 @@ extension AnyBidirectionalCollection {
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
+  @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
   @usableFromInline
   @_silgen_name("$ss26AnyBidirectionalCollectionV3mapySayqd__Gqd__xKXEKlF")
   func __rethrows_map<T>(
@@ -1703,6 +1690,7 @@ extension AnyRandomAccessCollection {
   // ABI-only entrypoint for the rethrows version of map, which has been
   // superseded by the typed-throws version. Expressed as "throws", which is
   // ABI-compatible with "rethrows".
+  @_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
   @usableFromInline
   @_silgen_name("$ss25AnyRandomAccessCollectionV3mapySayqd__Gqd__xKXEKlF")
   func __rethrows_map<T>(

stdlib/public/core/FloatingPointParsing.swift.gyb

@@ -169,7 +169,6 @@ extension ${Self}: LosslessStringConvertible {
       self.init(Substring(text))
     } else {
       self = 0.0
-#if $TypedThrows
       let success = _withUnprotectedUnsafeMutablePointer(to: &self) { p -> Bool in
         text.withCString { chars -> Bool in
           switch chars[0] {
@@ -185,23 +184,6 @@ extension ${Self}: LosslessStringConvertible {
           return endPtr != nil && endPtr![0] == 0
         }
       }
-#else
-      let success = __abi_se0413_withUnsafeMutablePointer(to: &self) { p -> Bool in
-        text.withCString { chars -> Bool in
-          switch chars[0] {
-          case 9, 10, 11, 12, 13, 32:
-            return false // Reject leading whitespace
-          case 0:
-            return false // Reject empty string
-          default:
-            break
-          }
-          let endPtr = _swift_stdlib_strto${cFuncSuffix2[bits]}_clocale(chars, p)
-          // Succeed only if endPtr points to end of C string
-          return endPtr != nil && endPtr![0] == 0
-        }
-      }
-#endif
       if !success {
         return nil
       }
@@ -216,7 +198,6 @@ extension ${Self}: LosslessStringConvertible {
   @available(SwiftStdlib 5.3, *)
   public init?(_ text: Substring) {
     self = 0.0
-#if $TypedThrows
     let success = _withUnprotectedUnsafeMutablePointer(to: &self) { p -> Bool in
       text.withCString { chars -> Bool in
         switch chars[0] {
@@ -232,23 +213,6 @@ extension ${Self}: LosslessStringConvertible {
         return endPtr != nil && endPtr![0] == 0
       }
     }
-#else
-    let success = __abi_se0413_withUnsafeMutablePointer(to: &self) { p -> Bool in
-      text.withCString { chars -> Bool in
-        switch chars[0] {
-        case 9, 10, 11, 12, 13, 32:
-          return false // Reject leading whitespace
-        case 0:
-          return false // Reject empty string
-        default:
-          break
-        }
-        let endPtr = _swift_stdlib_strto${cFuncSuffix2[bits]}_clocale(chars, p)
-        // Succeed only if endPtr points to end of C string
-        return endPtr != nil && endPtr![0] == 0
-      }
-    }
-#endif
     if !success {
       return nil
     }

stdlib/public/core/LifetimeManager.swift

@@ -106,14 +106,13 @@ public func withUnsafeMutablePointer<
   try body(UnsafeMutablePointer<T>(Builtin.addressof(&value)))
 }
 
-// FIXME(TypedThrows): Uncomment @_spi and revert rethrows
-//@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
+@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
 @_silgen_name("$ss24withUnsafeMutablePointer2to_q_xz_q_SpyxGKXEtKr0_lF")
 @usableFromInline
 internal func __abi_se0413_withUnsafeMutablePointer<T, Result>(
   to value: inout T,
   _ body: (UnsafeMutablePointer<T>) throws -> Result
-) rethrows -> Result {
+) throws -> Result {
   return try body(UnsafeMutablePointer<T>(Builtin.addressof(&value)))
 }
 
@@ -167,14 +166,13 @@ public func withUnsafePointer<T: ~Copyable, E: Error, Result: ~Copyable>(
 
 /// ABI: Historical withUnsafePointer(to:_:) rethrows, expressed as "throws",
 /// which is ABI-compatible with "rethrows".
-// FIXME(TypedThrows): Uncomment @_spi and revert rethrows
-//@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
+@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
 @_silgen_name("$ss17withUnsafePointer2to_q_x_q_SPyxGKXEtKr0_lF")
 @usableFromInline
 internal func __abi_withUnsafePointer<T, Result>(
   to value: T,
   _ body: (UnsafePointer<T>) throws -> Result
-) rethrows -> Result
+) throws -> Result
 {
   return try body(UnsafePointer<T>(Builtin.addressOfBorrow(value)))
 }
@@ -213,14 +211,13 @@ public func withUnsafePointer<T: ~Copyable, E: Error, Result: ~Copyable>(
 
 /// ABI: Historical withUnsafePointer(to:_:) rethrows,
 /// expressed as "throws", which is ABI-compatible with "rethrows".
-// FIXME(TypedThrows): Uncomment @_spi and revert rethrows
-//@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
+@_spi(SwiftStdlibLegacyABI) @available(swift, obsoleted: 1)
 @_silgen_name("$ss17withUnsafePointer2to_q_xz_q_SPyxGKXEtKr0_lF")
 @usableFromInline
 internal func __abi_se0413_withUnsafePointer<T, Result>(
   to value: inout T,
   _ body: (UnsafePointer<T>) throws -> Result
-) rethrows -> Result {
+) throws -> Result {
   return try body(UnsafePointer<T>(Builtin.addressof(&value)))
 }
 

stdlib/public/core/Random.swift

@@ -158,15 +158,9 @@ public struct SystemRandomNumberGenerator: RandomNumberGenerator, Sendable {
   @inlinable
   public mutating func next() -> UInt64 {
     var random: UInt64 = 0
-#if $TypedThrows
     _withUnprotectedUnsafeMutablePointer(to: &random) {
       swift_stdlib_random($0, MemoryLayout<UInt64>.size)
     }
-#else
-    __abi_se0413_withUnsafeMutablePointer(to: &random) {
-      swift_stdlib_random($0, MemoryLayout<UInt64>.size)
-    }
-#endif
     return random
   }
 }

stdlib/public/core/Runtime.swift

@@ -139,19 +139,11 @@ func _stdlib_atomicInitializeARCRef(
   let desiredPtr = unmanaged.toOpaque()
   let rawTarget = UnsafeMutableRawPointer(target).assumingMemoryBound(
     to: Optional<UnsafeRawPointer>.self)
-#if $TypedThrows
   let wonRace = withUnsafeMutablePointer(to: &expected) {
     _stdlib_atomicCompareExchangeStrongPtr(
       object: rawTarget, expected: $0, desired: desiredPtr
     )
   }
-#else
-  let wonRace = __abi_se0413_withUnsafeMutablePointer(to: &expected) {
-    _stdlib_atomicCompareExchangeStrongPtr(
-      object: rawTarget, expected: $0, desired: desiredPtr
-    )
-  }
-#endif
   if !wonRace {
     // Some other thread initialized the value.  Balance the retain that we
     // performed on 'desired'.