[stdlib] Enable NonescapableTypes

Author: lorentey

stdlib/public/core/Misc.swift

@@ -237,17 +237,12 @@ func _rethrowsViaClosure(_ fn: () throws -> ()) rethrows {
 ///     protocol NoRequirements: ~Copyable { }
 ///
 /// Extensions to the `Copyable` protocol are not allowed.
-@_marker public protocol Copyable {}
+@_marker public protocol Copyable/*: ~Escapable*/ {}
 
 @_documentation(visibility: internal)
-@_marker public protocol Escapable {}
+@_marker public protocol Escapable/*: ~Copyable*/ {}
 
-#if $BitwiseCopyable2
 @_marker public protocol BitwiseCopyable: ~Escapable { }
 
 @available(*, deprecated, message: "Use BitwiseCopyable")
 public typealias _BitwiseCopyable = BitwiseCopyable
-#else
-@_marker public protocol _BitwiseCopyable: ~Escapable { }
-public typealias BitwiseCopyable = _BitwiseCopyable
-#endif

stdlib/public/core/Optional.swift

@@ -133,10 +133,11 @@ public enum Optional<Wrapped: ~Copyable & ~Escapable>: ~Copyable, ~Escapable {
 }
 
 extension Optional: Copyable where Wrapped: Copyable /*& ~Escapable */ {}
+
 extension Optional: Escapable where Wrapped: Escapable /*& ~Copyable */ {}
 
-extension Optional: BitwiseCopyable where Wrapped: BitwiseCopyable {}
-// FIXME: Maybe BitwiseCopyable shouldn't require Escapability
+extension Optional: BitwiseCopyable
+where Wrapped: BitwiseCopyable & ~Escapable {}
 
 extension Optional: Sendable where Wrapped: ~Copyable & ~Escapable & Sendable {}
 

test/stdlib/Optional.swift

@@ -465,9 +465,7 @@ OptionalTests.test("BitwiseCopyability") {
   expectFalse(isBitwiseCopyable(Optional<NoncopyableStruct>.self))
   expectFalse(isBitwiseCopyable(Optional<RegularClass>.self))
 #if $NonescapableTypes
-  // FIXME: Should this be true?
-  expectFalse(isBitwiseCopyable(Optional<NonescapableStruct>.self))
-
+  expectTrue(isBitwiseCopyable(Optional<NonescapableStruct>.self))
   expectFalse(isBitwiseCopyable(Optional<NoncopyableNonescapableStruct>.self))
   expectFalse(isBitwiseCopyable(Optional<NonescapableNontrivialStruct>.self))
 #endif