Merge pull request #3885 from apple/stdlib-remove-sizeof

stdlib: SE-0101: remove old syntax

Author: gribozavr

stdlib/public/SDK/Foundation/Data.swift

@@ -669,7 +669,7 @@ public struct Data : ReferenceConvertible, Equatable, Hashable, RandomAccessColl
         public mutating func next() -> UInt8? {
             guard _idx < _endIdx else { return nil }
             defer { _idx += 1 }
-            let bufferSize = sizeofValue(_buffer)
+            let bufferSize = MemoryLayout._ofInstance(_buffer).size
             return withUnsafeMutablePointer(to: &_buffer) { ptr_ in
                 let ptr = UnsafeMutableRawPointer(ptr_).assumingMemoryBound(to: UInt8.self)
                 let bufferIdx = _idx % bufferSize

stdlib/public/core/Builtin.swift

@@ -15,56 +15,34 @@ import SwiftShims
 // Definitions that make elements of Builtin usable in real code
 // without gobs of boilerplate.
 
-/// Returns the contiguous memory footprint of `T`.
-///
-/// Does not include any dynamically-allocated or "remote" storage.
-/// In particular, `sizeof(X.self)`, when `X` is a class type, is the
-/// same regardless of how many stored properties `X` has.
-@available(*, deprecated, message: "use MemoryLayout<T>.size instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.size instead.")
 public func sizeof<T>(_:T.Type) -> Int {
-  return Int(Builtin.sizeof(T.self))
+  Builtin.unreachable()
 }
 
-/// Returns the contiguous memory footprint of  `T`.
-///
-/// Does not include any dynamically-allocated or "remote" storage.
-/// In particular, `sizeof(a)`, when `a` is a class instance, is the
-/// same regardless of how many stored properties `a` has.
-@available(*, deprecated, message: "use MemoryLayout<T>.size instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.size instead.")
 public func sizeofValue<T>(_:T) -> Int {
-  return sizeof(T.self)
+  Builtin.unreachable()
 }
 
-/// Returns the minimum memory alignment of `T`.
-@available(*, deprecated, message: "use MemoryLayout<T>.alignment instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.alignment instead.")
 public func alignof<T>(_:T.Type) -> Int {
-  return Int(Builtin.alignof(T.self))
+  Builtin.unreachable()
 }
 
-/// Returns the minimum memory alignment of `T`.
-@available(*, deprecated, message: "use MemoryLayout<T>.alignment instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.alignment instead.")
 public func alignofValue<T>(_:T) -> Int {
-  return alignof(T.self)
+  Builtin.unreachable()
 }
 
-/// Returns the least possible interval between distinct instances of
-/// `T` in memory.  The result is always positive.
-@available(*, deprecated, message: "use MemoryLayout<T>.stride instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.stride instead.")
 public func strideof<T>(_:T.Type) -> Int {
-  return Int(Builtin.strideof_nonzero(T.self))
+  Builtin.unreachable()
 }
 
-/// Returns the least possible interval between distinct instances of
-/// `T` in memory.  The result is always positive.
-@available(*, deprecated, message: "use MemoryLayout<T>.stride instead.")
-@_transparent
+@available(*, unavailable, message: "use MemoryLayout<T>.stride instead.")
 public func strideofValue<T>(_:T) -> Int {
-  return strideof(T.self)
+  Builtin.unreachable()
 }
 
 // This function is the implementation of the `_roundUp` overload set.  It is

validation-test/stdlib/CoreAudio.swift

@@ -202,9 +202,9 @@ CoreAudioTestSuite.test(
 CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.count") {
   let sizeInBytes = AudioBufferList.sizeInBytes(maximumBuffers: 16)
   let rawPtr = UnsafeMutableRawPointer.allocate(
-    bytes: sizeInBytes, alignedTo: alignof(AudioBufferList.self))
+    bytes: sizeInBytes, alignedTo: MemoryLayout<AudioBufferList>.alignment)
   let ablPtr = rawPtr.bindMemory(to: AudioBufferList.self,
-    capacity: sizeInBytes / strideof(AudioBufferList.self))
+    capacity: sizeInBytes / MemoryLayout<AudioBufferList>.stride)
 
   // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
   // the 'count' property has a nonmutating setter.
@@ -219,7 +219,7 @@ CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.count") {
   expectEqual(0x7765_4321, rawPtr.load(as: UInt32.self))
 
   rawPtr.deallocate(
-    bytes: sizeInBytes, alignedTo: alignof(AudioBufferList.self))
+    bytes: sizeInBytes, alignedTo: MemoryLayout<AudioBufferList>.alignment)
 }
 
 CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.subscript(_: Int)") {
@@ -230,7 +230,7 @@ CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.subscript(_: Int)")
 
   let ablPtr = rawPtr.bindMemory(
     to: AudioBufferList.self,
-    capacity: sizeInBytes / sizeof(AudioBufferList.self))
+    capacity: sizeInBytes / MemoryLayout<AudioBufferList>.stride)
 
   // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
   // the subscript has a nonmutating setter.