Revert "Revert "Merge pull request #1247 from kelvin13/se-0184a""

Foundation/AffineTransform.swift

@@ -369,9 +369,9 @@ open class NSAffineTransform : NSObject, NSCopying, NSSecureCoding {
             preconditionFailure("Unkeyed coding is unsupported.")
         }
 
-        let pointer = UnsafeMutableRawPointer.allocate(bytes: MemoryLayout<Float>.stride * 6, alignedTo: 1)
+        let pointer = UnsafeMutableRawPointer.allocate(byteCount: MemoryLayout<Float>.stride * 6, alignment: 1)
         defer {
-            pointer.deallocate(bytes: MemoryLayout<Float>.stride * 6, alignedTo: 1)
+            pointer.deallocate()
         }
         aDecoder.decodeValue(ofObjCType: "[6f]", at: pointer)
 

Foundation/Data.swift

@@ -153,7 +153,7 @@ public final class _DataStorage {
                 }
                 return try apply(UnsafeRawBufferPointer(start: d.bytes.advanced(by: range.lowerBound - _offset), count: Swift.min(range.count, len)))
             } else {
-                var buffer = UnsafeMutableRawBufferPointer.allocate(count: range.count)
+                var buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: range.count, alignment: MemoryLayout<UInt>.alignment)
                 defer { buffer.deallocate() }
                 let sliceRange = NSRange(location: range.lowerBound - _offset, length: range.count)
                 var enumerated = 0
@@ -184,7 +184,7 @@ public final class _DataStorage {
                 }
                 return try apply(UnsafeRawBufferPointer(start: d.bytes.advanced(by: range.lowerBound - _offset), count: Swift.min(range.count, len)))
             } else {
-                var buffer = UnsafeMutableRawBufferPointer.allocate(count: range.count)
+                var buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: range.count, alignment: MemoryLayout<UInt>.alignment)
                 defer { buffer.deallocate() }
                 let sliceRange = NSRange(location: range.lowerBound - _offset, length: range.count)
                 var enumerated = 0

Foundation/Dictionary.swift

@@ -30,8 +30,8 @@ extension Dictionary : _ObjectTypeBridgeable {
 
         keyBuffer.deinitialize(count: count)
         valueBuffer.deinitialize(count: count)
-        keyBuffer.deallocate(capacity: count)
-        valueBuffer.deallocate(capacity: count)
+        keyBuffer.deallocate()
+        valueBuffer.deallocate()
 
         return dict
 
@@ -75,8 +75,8 @@ extension Dictionary : _ObjectTypeBridgeable {
             }
             keys.deinitialize(count: cnt)
             values.deinitialize(count: cnt)
-            keys.deallocate(capacity: cnt)
-            values.deallocate(capacity: cnt)
+            keys.deallocate()
+            values.deallocate()
         }
         if !failedConversion {
             result = dict

Foundation/FileManager.swift

@@ -462,7 +462,7 @@ open class FileManager : NSObject {
             ps.advanced(by: 1).initialize(to: nil)
             let stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
             ps.deinitialize(count: 2)
-            ps.deallocate(capacity: 2)
+            ps.deallocate()
 
             if stream != nil {
                 defer {
@@ -682,7 +682,7 @@ open class FileManager : NSObject {
         }
         if !path._nsObject.getFileSystemRepresentation(buf, maxLength: len) {
             buf.deinitialize(count: len)
-            buf.deallocate(capacity: len)
+            buf.deallocate()
             fatalError("string could not be converted")
         }
         return UnsafePointer(buf)
@@ -1038,7 +1038,7 @@ extension FileManager {
                 ps.advanced(by: 1).initialize(to: nil)
                 _stream = fts_open(ps, FTS_PHYSICAL | FTS_XDEV | FTS_NOCHDIR, nil)
                 ps.deinitialize(count: 2)
-                ps.deallocate(capacity: 2)
+                ps.deallocate()
             } else {
                 _rootError = _NSErrorWithErrno(ENOENT, reading: true, url: url)
             }

Foundation/Host.swift

@@ -42,8 +42,7 @@ open class Host: NSObject {
     static internal func currentHostName() -> String {
         let hname = UnsafeMutablePointer<Int8>.allocate(capacity: Int(NI_MAXHOST))
         defer {
-            hname.deinitialize()
-            hname.deallocate(capacity: Int(NI_MAXHOST))
+            hname.deallocate()
         }
         let r = gethostname(hname, Int(NI_MAXHOST))
         if r < 0 || hname[0] == 0 {
@@ -80,8 +79,7 @@ open class Host: NSObject {
         let address = UnsafeMutablePointer<Int8>.allocate(capacity: Int(NI_MAXHOST))
         defer {
             freeifaddrs(ifaddr)
-            address.deinitialize()
-            address.deallocate(capacity: Int(NI_MAXHOST))
+            address.deallocate()
         }
         while let ifaValue = ifa?.pointee {
             if let ifa_addr = ifaValue.ifa_addr, ifaValue.ifa_flags & UInt32(IFF_LOOPBACK) == 0 {
@@ -138,8 +136,7 @@ open class Host: NSObject {
             var res: UnsafeMutablePointer<addrinfo>? = res0
             let host = UnsafeMutablePointer<Int8>.allocate(capacity: Int(NI_MAXHOST))
             defer {
-                host.deinitialize()
-                host.deallocate(capacity: Int(NI_MAXHOST))
+                host.deallocate()
             }
             while res != nil {
                 let info = res!.pointee
@@ -186,4 +183,3 @@ open class Host: NSObject {
         return nil
     }
 }
-

Foundation/JSONSerialization.swift

@@ -820,9 +820,9 @@ private struct JSONReader {
 
                 let startPointer = buffer.baseAddress!
                 let intEndPointer = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 1)
-                defer { intEndPointer.deallocate(capacity: 1) }
+                defer { intEndPointer.deallocate() }
                 let doubleEndPointer = UnsafeMutablePointer<UnsafeMutablePointer<Int8>?>.allocate(capacity: 1)
-                defer { doubleEndPointer.deallocate(capacity: 1) }
+                defer { doubleEndPointer.deallocate() }
                 let intResult = strtol(startPointer, intEndPointer, 10)
                 let intDistance = startPointer.distance(to: intEndPointer[0]!)
                 let doubleResult = strtod(startPointer, doubleEndPointer)

Foundation/NSArray.swift

@@ -148,7 +148,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
         buffer.initialize(from: optionalArray, count: cnt)
         self.init(objects: buffer, count: cnt)
         buffer.deinitialize(count: cnt)
-        buffer.deallocate(capacity: cnt)
+        buffer.deallocate()
     }
 
     open override func isEqual(_ value: Any?) -> Bool {
@@ -404,7 +404,7 @@ open class NSArray : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCo
             }
         }
         return Data(bytesNoCopy: buffer, count: size, deallocator: .custom({ (_, _) in
-            buffer.deallocate(capacity: size)
+            buffer.deallocate()
         }))
     }
 

Foundation/NSCFDictionary.swift

@@ -71,8 +71,8 @@ internal final class _NSCFDictionary : NSMutableDictionary {
                 let key = unsafeBitCast(keys.advanced(by: idx).pointee!, to: NSObject.self)
                 keyArray.append(key)
             }
-            keys.deinitialize()
-            keys.deallocate(capacity: count)
+            keys.deinitialize(count: 1)
+            keys.deallocate()
         }
     }
 

Foundation/NSCFSet.swift

@@ -58,8 +58,8 @@ internal final class _NSCFSet : NSMutableSet {
             let obj = unsafeBitCast(objects.advanced(by: idx).pointee!, to: AnyObject.self)
             objArray.append(obj)
         }
-        objects.deinitialize()
-        objects.deallocate(capacity: count)
+        objects.deinitialize(count: 1)
+        objects.deallocate()
 
         return NSGeneratorEnumerator(objArray.makeIterator())
 

Foundation/NSCoder.swift

@@ -105,7 +105,7 @@ open class NSCoder : NSObject {
     deinit {
         for buffer in _pendingBuffers {
             // Cannot deinitialize a pointer to unknown type.
-            buffer.0.deallocate(bytes: buffer.1, alignedTo: MemoryLayout<Int>.alignment)
+            buffer.0.deallocate()
         }
     }
 
@@ -383,7 +383,7 @@ open class NSCoder : NSObject {
             decodeValue(ofObjCType: "I", at: unsafeBitCast(ptr, to: UnsafeMutableRawPointer.self))
         }
         // we cannot autorelease here so instead the pending buffers will manage the lifespan of the returned data... this is wasteful but good enough...
-        let result = UnsafeMutableRawPointer.allocate(bytes: Int(length), alignedTo: MemoryLayout<Int>.alignment)
+        let result = UnsafeMutableRawPointer.allocate(byteCount: Int(length), alignment: MemoryLayout<Int>.alignment)
         decodeValue(ofObjCType: "c", at: result)
         lengthp.pointee = Int(length)
         _pendingBuffers.append((result, Int(length)))

Foundation/NSConcreteValue.swift

@@ -91,17 +91,17 @@ internal class NSConcreteValue : NSValue {
 
         self._typeInfo = typeInfo!
 
-        self._storage = UnsafeMutableRawPointer.allocate(bytes: self._typeInfo.size, alignedTo: 1)
-        self._storage.copyBytes(from: value, count: self._typeInfo.size)
+        self._storage = UnsafeMutableRawPointer.allocate(byteCount: self._typeInfo.size, alignment: 1)
+        self._storage.copyMemory(from: value, byteCount: self._typeInfo.size)
     }
 
     deinit {
         // Cannot deinitialize raw memory.
-        self._storage.deallocate(bytes: self._size, alignedTo: 1)
+        self._storage.deallocate()
     }
 
     override func getValue(_ value: UnsafeMutableRawPointer) {
-        value.copyBytes(from: self._storage, count: self._size)
+        value.copyMemory(from: self._storage, byteCount: self._size)
     }
 
     override var objCType : UnsafePointer<Int8> {

Foundation/NSDictionary.swift

@@ -154,8 +154,8 @@ open class NSDictionary : NSObject, NSCopying, NSMutableCopying, NSSecureCoding,
 
         keyBuffer.deinitialize(count: keys.count)
         valueBuffer.deinitialize(count: objects.count)
-        keyBuffer.deallocate(capacity: keys.count)
-        valueBuffer.deallocate(capacity: objects.count)
+        keyBuffer.deallocate()
+        valueBuffer.deallocate()
     }
 
     public convenience init(dictionary otherDictionary: [AnyHashable : Any]) {

Foundation/NSGeometry.swift

@@ -70,7 +70,7 @@ extension CGPoint: NSSpecialValueCoding {
     }
 
     func getValue(_ value: UnsafeMutableRawPointer) {
-        value.initializeMemory(as: CGPoint.self, to: self)
+        value.initializeMemory(as: CGPoint.self, repeating: self, count: 1)
     }
 
     func isEqual(_ aValue: Any) -> Bool {
@@ -162,7 +162,7 @@ extension CGSize: NSSpecialValueCoding {
     }
 
     func getValue(_ value: UnsafeMutableRawPointer) {
-        value.initializeMemory(as: CGSize.self, to: self)
+        value.initializeMemory(as: CGSize.self, repeating: self, count: 1)
     }
 
     func isEqual(_ aValue: Any) -> Bool {
@@ -466,7 +466,7 @@ extension CGRect: NSSpecialValueCoding {
     }
 
     func getValue(_ value: UnsafeMutableRawPointer) {
-        value.initializeMemory(as: CGRect.self, to: self)
+        value.initializeMemory(as: CGRect.self, repeating: self, count: 1)
     }
 
     func isEqual(_ aValue: Any) -> Bool {
@@ -565,7 +565,7 @@ extension NSEdgeInsets: NSSpecialValueCoding {
     }
 
     func getValue(_ value: UnsafeMutableRawPointer) {
-        value.initializeMemory(as: NSEdgeInsets.self, to: self)
+        value.initializeMemory(as: NSEdgeInsets.self, repeating: self, count: 1)
     }
 
     func isEqual(_ aValue: Any) -> Bool {

Foundation/NSKeyedCoderOldStyleArray.swift

@@ -41,7 +41,7 @@ internal final class _NSKeyedCoderOldStyleArray : NSObject, NSCopying, NSSecureC
     deinit {
         if self._decoded {
             // Cannot deinitialize memory without knowing the element type.
-            self._addr.deallocate(bytes: self._count * self._size, alignedTo: 1)
+            self._addr.deallocate()
         }
     }
 
@@ -61,7 +61,7 @@ internal final class _NSKeyedCoderOldStyleArray : NSObject, NSCopying, NSSecureC
             return nil
         }
 
-        self._addr = UnsafeMutableRawPointer.allocate(bytes: self._count * self._size, alignedTo: 1)
+        self._addr = UnsafeMutableRawPointer.allocate(byteCount: self._count * self._size, alignment: 1)
 
         super.init()
 
@@ -95,7 +95,7 @@ internal final class _NSKeyedCoderOldStyleArray : NSObject, NSCopying, NSSecureC
 
     func fillObjCType(_ type: _NSSimpleObjCType, count: Int, at addr: UnsafeMutableRawPointer) {
         if type == self._type && count <= self._count {
-            addr.copyBytes(from: self._addr, count: count * self._size)
+            addr.copyMemory(from: self._addr, byteCount: count * self._size)
         }
     }
 

Foundation/NSLock.swift

@@ -46,8 +46,8 @@ open class NSLock: NSObject, NSLocking {
 
     deinit {
         pthread_mutex_destroy(mutex)
-        mutex.deinitialize()
-        mutex.deallocate(capacity: 1)
+        mutex.deinitialize(count: 1)
+        mutex.deallocate()
 #if os(OSX) || os(iOS)
         deallocateTimedLockData(cond: timeoutCond, mutex: timeoutMutex)
 #endif
@@ -196,8 +196,8 @@ open class NSRecursiveLock: NSObject, NSLocking {
 
     deinit {
         pthread_mutex_destroy(mutex)
-        mutex.deinitialize()
-        mutex.deallocate(capacity: 1)
+        mutex.deinitialize(count: 1)
+        mutex.deallocate()
 #if os(OSX) || os(iOS)
         deallocateTimedLockData(cond: timeoutCond, mutex: timeoutMutex)
 #endif
@@ -251,10 +251,10 @@ open class NSCondition: NSObject, NSLocking {
     deinit {
         pthread_mutex_destroy(mutex)
         pthread_cond_destroy(cond)
-        mutex.deinitialize()
-        cond.deinitialize()
-        mutex.deallocate(capacity: 1)
-        cond.deallocate(capacity: 1)
+        mutex.deinitialize(count: 1)
+        cond.deinitialize(count: 1)
+        mutex.deallocate()
+        cond.deallocate()
     }
 
     open func lock() {

Foundation/NSOrderedSet.swift

@@ -302,7 +302,7 @@ extension NSOrderedSet {
         }
         self.init(objects: buffer, count: array.count)
         buffer.deinitialize(count: array.count)
-        buffer.deallocate(capacity: array.count)
+        buffer.deallocate()
     }
 
     public convenience init(array set: [Any], copyItems flag: Bool) {

Foundation/NSRange.swift

@@ -400,7 +400,7 @@ extension NSRange: NSSpecialValueCoding {
     }
 
     func getValue(_ value: UnsafeMutableRawPointer) {
-        value.initializeMemory(as: NSRange.self, to: self)
+        value.initializeMemory(as: NSRange.self, repeating: self, count: 1)
     }
 
     func isEqual(_ aValue: Any) -> Bool {
@@ -426,4 +426,3 @@ extension NSValue {
     }
 }
 #endif
-

Foundation/NSSet.swift

@@ -135,7 +135,7 @@ open class NSSet : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSCodi
         }
         self.init(objects: buffer, count: array.count)
         buffer.deinitialize(count: array.count)
-        buffer.deallocate(capacity: array.count)
+        buffer.deallocate()
     }
 
     public convenience init(set: Set<AnyHashable>) {

Foundation/NSString.swift

@@ -247,8 +247,8 @@ open class NSString : NSObject, NSCopying, NSMutableCopying, NSSecureCoding, NSC
         let characters = UnsafeMutablePointer<unichar>.allocate(capacity: length)
         getCharacters(characters, range: NSMakeRange(0, length))
         let result = NSMutableString(characters: characters, length: length)
-        characters.deinitialize()
-        characters.deallocate(capacity: length)
+        characters.deinitialize(count: 1)
+        characters.deallocate()
         return result
     }
 
@@ -364,8 +364,8 @@ extension NSString {
             let buff = UnsafeMutablePointer<unichar>.allocate(capacity: range.length)
             getCharacters(buff, range: range)
             let result = String(describing: buff)
-            buff.deinitialize()
-            buff.deallocate(capacity: range.length)
+            buff.deinitialize(count: 1)
+            buff.deallocate()
             return result
         }
     }

Foundation/NSSwiftRuntime.swift

@@ -342,7 +342,7 @@ extension Array {
             let buffer = UnsafeMutablePointer<Element>.allocate(capacity: count)
             let res = body(buffer)
             buffer.deinitialize(count: count)
-            buffer.deallocate(capacity: count)
+            buffer.deallocate()
             return res
         } else {
             return withUnsafeMutableBufferPointer() { (bufferPtr: inout UnsafeMutableBufferPointer<Element>) -> R in