[embedded] Simplify AnyObject/Builtin.NativeObject split in arrays by using a typealias

Author: kubamracek

stdlib/public/core/Array.swift

@@ -476,17 +476,11 @@ extension Array: _ArrayProtocol {
     return _getCapacity()
   }
 
-  /// An object that guarantees the lifetime of this array's elements.
   #if $Embedded
-  public // @testable
-  var _owner: Builtin.NativeObject? {
-    @inlinable // FIXME(inline-always)
-    @inline(__always)
-    get {
-      return _buffer.owner      
-    }
-  }
-  #else
+  public typealias AnyObject = Builtin.NativeObject
+  #endif
+
+  /// An object that guarantees the lifetime of this array's elements.
   @inlinable
   public // @testable
   var _owner: AnyObject? {
@@ -496,7 +490,6 @@ extension Array: _ArrayProtocol {
       return _buffer.owner      
     }
   }
-  #endif
 
   /// If the elements are stored contiguously, a pointer to the first
   /// element. Otherwise, `nil`.
@@ -1492,7 +1485,6 @@ extension Array: CustomStringConvertible, CustomDebugStringConvertible {
 }
 
 extension Array {
-  #if !$Embedded
   @usableFromInline @_transparent
   @_unavailableInEmbedded
   internal func _cPointerArgs() -> (AnyObject?, UnsafeRawPointer?) {
@@ -1503,18 +1495,6 @@ extension Array {
     let n = ContiguousArray(self._buffer)._buffer
     return (n.owner, UnsafeRawPointer(n.firstElementAddress))
   }
-  #else
-  @usableFromInline @_transparent
-  @_unavailableInEmbedded
-  internal func _cPointerArgs() -> (Builtin.NativeObject?, UnsafeRawPointer?) {
-    let p = _baseAddressIfContiguous
-    if _fastPath(p != nil || isEmpty) {
-      return (_owner, UnsafeRawPointer(p))
-    }
-    let n = ContiguousArray(self._buffer)._buffer
-    return (n.owner, UnsafeRawPointer(n.firstElementAddress))
-  }
-  #endif
 }
 
 extension Array {

stdlib/public/core/ArrayBufferProtocol.swift

@@ -97,13 +97,13 @@ where Indices == Range<Int> {
   /// The number of elements the buffer can store without reallocation.
   var capacity: Int { get }
 
-  /// An object that keeps the elements stored in this buffer alive.
   #if $Embedded
-  var owner: Builtin.NativeObject { get }
-  #else
-  var owner: AnyObject { get }
+  typealias AnyObject = Builtin.NativeObject
   #endif
 
+  /// An object that keeps the elements stored in this buffer alive.
+  var owner: AnyObject { get }
+
   /// A pointer to the first element.
   ///
   /// - Precondition: The elements are known to be stored contiguously.

stdlib/public/core/ArraySlice.swift

@@ -1152,18 +1152,6 @@ extension ArraySlice: CustomStringConvertible, CustomDebugStringConvertible {
 }
 
 extension ArraySlice {
-  #if $Embedded
-  @usableFromInline @_transparent
-  @_unavailableInEmbedded
-  internal func _cPointerArgs() -> (Builtin.NativeObject?, UnsafeRawPointer?) {
-    let p = _baseAddressIfContiguous
-    if _fastPath(p != nil || isEmpty) {
-      return (_owner, UnsafeRawPointer(p))
-    }
-    let n = ContiguousArray(self._buffer)._buffer
-    return (n.owner, UnsafeRawPointer(n.firstElementAddress))
-  }
-  #else
   @usableFromInline @_transparent
   internal func _cPointerArgs() -> (AnyObject?, UnsafeRawPointer?) {
     let p = _baseAddressIfContiguous
@@ -1173,7 +1161,6 @@ extension ArraySlice {
     let n = ContiguousArray(self._buffer)._buffer
     return (n.owner, UnsafeRawPointer(n.firstElementAddress))
   }
-  #endif
 }
 
 extension ArraySlice {

stdlib/public/core/ArrayType.swift

@@ -17,12 +17,12 @@ where Indices == Range<Int> {
   /// The number of elements the Array can store without reallocation.
   var capacity: Int { get }
 
+  #if $Embedded
+  typealias AnyObject = Builtin.NativeObject
+  #endif
+
   /// An object that guarantees the lifetime of this array's elements.
-  #if !$Embedded
   var _owner: AnyObject? { get }
-  #else
-  var _owner: Builtin.NativeObject? { get }
-  #endif
 
   /// If the elements are stored contiguously, a pointer to the first
   /// element. Otherwise, `nil`.

stdlib/public/core/ContiguousArray.swift

@@ -147,20 +147,16 @@ extension ContiguousArray: _ArrayProtocol {
     return _getCapacity()
   }
 
+  #if $Embedded
+  public typealias AnyObject = Builtin.NativeObject
+  #endif
+
   /// An object that guarantees the lifetime of this array's elements.
-  #if !$Embedded
   @inlinable
   public // @testable
   var _owner: AnyObject? {
     return _buffer.owner
   }
-  #else
-  @inlinable
-  public // @testable
-  var _owner: Builtin.NativeObject? {
-    return _buffer.owner
-  }
-  #endif
 
   /// If the elements are stored contiguously, a pointer to the first
   /// element. Otherwise, `nil`.
@@ -1060,18 +1056,6 @@ extension ContiguousArray: CustomStringConvertible, CustomDebugStringConvertible
 }
 
 extension ContiguousArray {
-  #if $Embedded
-  @usableFromInline @_transparent
-  @_unavailableInEmbedded
-  internal func _cPointerArgs() -> (Builtin.NativeObject?, UnsafeRawPointer?) {
-    let p = _baseAddressIfContiguous
-    if _fastPath(p != nil || isEmpty) {
-      return (_owner, UnsafeRawPointer(p))
-    }
-    let n = ContiguousArray(self._buffer)._buffer
-    return (n.owner, UnsafeRawPointer(n.firstElementAddress))
-  }
-  #else
   @usableFromInline @_transparent
   internal func _cPointerArgs() -> (AnyObject?, UnsafeRawPointer?) {
     let p = _baseAddressIfContiguous
@@ -1081,7 +1065,6 @@ extension ContiguousArray {
     let n = ContiguousArray(self._buffer)._buffer
     return (n.owner, UnsafeRawPointer(n.firstElementAddress))
   }
-  #endif
 }
 
 extension ContiguousArray {

stdlib/public/core/ContiguousArrayBuffer.swift

@@ -844,31 +844,25 @@ internal struct _ContiguousArrayBuffer<Element>: _ArrayBufferProtocol {
   }
 #endif
 
-  #if !$Embedded
-  /// An object that keeps the elements stored in this buffer alive.
-  @inlinable
-  internal var owner: AnyObject {
-    return _storage
-  }
+  #if $Embedded
+  public typealias AnyObject = Builtin.NativeObject
+  #endif
 
   /// An object that keeps the elements stored in this buffer alive.
   @inlinable
-  internal var nativeOwner: AnyObject {
+  internal var owner: AnyObject {
+    #if !$Embedded
     return _storage
-  }
-  #else
-  /// An object that keeps the elements stored in this buffer alive.
-  @inlinable
-  internal var owner: Builtin.NativeObject {
+    #else
     return Builtin.castToNativeObject(_storage)
+    #endif
   }
 
   /// An object that keeps the elements stored in this buffer alive.
   @inlinable
-  internal var nativeOwner: Builtin.NativeObject {
-    return Builtin.castToNativeObject(_storage)
+  internal var nativeOwner: AnyObject {
+    return owner
   }
-  #endif
 
   /// A value that identifies the storage used by the buffer.
   ///

stdlib/public/core/Pointer.swift

@@ -415,33 +415,13 @@ func _convertInOutToPointerArgument<
   return ToPointer(from)
 }
 
+#if !$Embedded
+
 /// Derive a pointer argument from a value array parameter.
 ///
 /// This always produces a non-null pointer, even if the array doesn't have any
 /// storage.
-#if $Embedded
 @_transparent
-@_unavailableInEmbedded
-public // COMPILER_INTRINSIC
-func _convertConstArrayToPointerArgument<
-  FromElement,
-  ToPointer: _Pointer
->(_ arr: [FromElement]) -> (Builtin.NativeObject?, ToPointer) {
-  let (owner, opaquePointer) = arr._cPointerArgs()
-
-  let validPointer: ToPointer
-  if let addr = opaquePointer {
-    validPointer = ToPointer(addr._rawValue)
-  } else {
-    let lastAlignedValue = ~(MemoryLayout<FromElement>.alignment - 1)
-    let lastAlignedPointer = UnsafeRawPointer(bitPattern: lastAlignedValue)!
-    validPointer = ToPointer(lastAlignedPointer._rawValue)
-  }
-  return (owner, validPointer)
-}
-#else
-@_transparent
-@_unavailableInEmbedded
 public // COMPILER_INTRINSIC
 func _convertConstArrayToPointerArgument<
   FromElement,
@@ -459,31 +439,11 @@ func _convertConstArrayToPointerArgument<
   }
   return (owner, validPointer)
 }
-#endif
 
 /// Derive a pointer argument from an inout array parameter.
 ///
 /// This always produces a non-null pointer, even if the array's length is 0.
-#if $Embedded
-@_transparent
-@_unavailableInEmbedded
-public // COMPILER_INTRINSIC
-func _convertMutableArrayToPointerArgument<
-  FromElement,
-  ToPointer: _Pointer
->(_ a: inout [FromElement]) -> (Builtin.NativeObject?, ToPointer) {
-  // TODO: Putting a canary at the end of the array in checked builds might
-  // be a good idea
-
-  // Call reserve to force contiguous storage.
-  a.reserveCapacity(0)
-  _debugPrecondition(a._baseAddressIfContiguous != nil || a.isEmpty)
-
-  return _convertConstArrayToPointerArgument(a)
-}
-#else
 @_transparent
-@_unavailableInEmbedded
 public // COMPILER_INTRINSIC
 func _convertMutableArrayToPointerArgument<
   FromElement,
@@ -498,27 +458,35 @@ func _convertMutableArrayToPointerArgument<
 
   return _convertConstArrayToPointerArgument(a)
 }
-#endif
 
 /// Derive a UTF-8 pointer argument from a value string parameter.
-#if $Embedded
 @_transparent
-@_unavailableInEmbedded
 public // COMPILER_INTRINSIC
 func _convertConstStringToUTF8PointerArgument<
   ToPointer: _Pointer
->(_ str: String) -> (Builtin.NativeObject?, ToPointer) {
+>(_ str: String) -> (AnyObject?, ToPointer) {
   let utf8 = Array(str.utf8CString)
   return _convertConstArrayToPointerArgument(utf8)
 }
+
 #else
-@_transparent
-@_unavailableInEmbedded
-public // COMPILER_INTRINSIC
-func _convertConstStringToUTF8PointerArgument<
-  ToPointer: _Pointer
->(_ str: String) -> (AnyObject?, ToPointer) {
-  let utf8 = Array(str.utf8CString)
-  return _convertConstArrayToPointerArgument(utf8)
+
+@_unavailableInEmbedded public
+func _convertConstArrayToPointerArgument<FromElement,ToPointer: _Pointer>(
+    _ arr: [FromElement]) -> (Builtin.NativeObject?, ToPointer) {
+  fatalError("unreachable in embedded Swift (marked as unavailable)")
+}
+
+@_unavailableInEmbedded public
+func _convertMutableArrayToPointerArgument<FromElement, ToPointer: _Pointer>(
+    _ a: inout [FromElement]) -> (Builtin.NativeObject?, ToPointer) {
+  fatalError("unreachable in embedded Swift (marked as unavailable)")
 }
+
+@_unavailableInEmbedded public
+func _convertConstStringToUTF8PointerArgument<ToPointer: _Pointer>(
+    _ str: String) -> (Builtin.NativeObject?, ToPointer) {
+  fatalError("unreachable in embedded Swift (marked as unavailable)")
+}
+
 #endif

stdlib/public/core/SliceBuffer.swift

@@ -26,14 +26,9 @@ internal struct _SliceBuffer<Element>
   @usableFromInline
   internal typealias NativeBuffer = _ContiguousArrayBuffer<Element>
 
-  #if $Embedded
   /// An object that keeps the elements stored in this buffer alive.
   @usableFromInline
-  internal var owner: Builtin.NativeObject
-  #else
-  @usableFromInline
   internal var owner: AnyObject
-  #endif
 
   @usableFromInline
   internal let subscriptBaseAddress: UnsafeMutablePointer<Element>