UnsafeMutablePointer.alloc(_:) => UnsafeMutablePointer(allocatingCapacity:)

Author: gribozavr

Diff for: stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.swift

@@ -14,7 +14,7 @@
 func _stdlib_getPointer(x: OpaquePointer) -> OpaquePointer
 
 public func _opaqueIdentity<T>(x: T) -> T {
-  let ptr = UnsafeMutablePointer<T>.alloc(1)
+  let ptr = UnsafeMutablePointer<T>(allocatingCapacity: 1)
   ptr.initialize(x)
   let result =
     UnsafeMutablePointer<T>(_stdlib_getPointer(OpaquePointer(ptr))).memory

Diff for: stdlib/private/StdlibUnittest/StdlibUnittest.swift.gyb

@@ -1930,7 +1930,7 @@ public func checkSequence<
   sequence._preprocessingPass { (sequence)->Void in 
     var count = 0
     for _ in sequence { ++count }
-    let buf = UnsafeMutablePointer<S.Iterator.Element>.alloc(count)
+    let buf = UnsafeMutablePointer<S.Iterator.Element>(allocatingCapacity: count)
     let end = sequence._initializeTo(buf)
     expectTrue(end == buf + count, "_initializeTo returned the wrong value")
     var j = expected.startIndex

Diff for: stdlib/private/SwiftPrivate/ShardedAtomicCounter.swift

@@ -33,7 +33,7 @@ public struct _stdlib_ShardedAtomicCounter {
   public init() {
     let hardwareConcurrency = _stdlib_getHardwareConcurrency()
     let count = max(8, hardwareConcurrency * hardwareConcurrency)
-    let shards = UnsafeMutablePointer<Int>.alloc(count)
+    let shards = UnsafeMutablePointer<Int>(allocatingCapacity: count)
     for var i = 0; i != count; i++ {
       (shards + i).initialize(0)
     }

Diff for: stdlib/private/SwiftPrivatePthreadExtras/PthreadBarriers.swift

@@ -67,12 +67,12 @@ public func _stdlib_pthread_barrier_init(
     errno = EINVAL
     return -1
   }
-  barrier.memory.mutex = UnsafeMutablePointer.alloc(1)
+  barrier.memory.mutex = UnsafeMutablePointer(allocatingCapacity: 1)
   if pthread_mutex_init(barrier.memory.mutex, nil) != 0 {
     // FIXME: leaking memory.
     return -1
   }
-  barrier.memory.cond = UnsafeMutablePointer.alloc(1)
+  barrier.memory.cond = UnsafeMutablePointer(allocatingCapacity: 1)
   if pthread_cond_init(barrier.memory.cond, nil) != 0 {
     // FIXME: leaking memory, leaking a mutex.
     return -1

Diff for: stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift

@@ -41,7 +41,7 @@ internal class PthreadBlockContextImpl<Argument, Result>: PthreadBlockContext {
   }
 
   override func run() -> UnsafeMutablePointer<Void> {
-    let result = UnsafeMutablePointer<Result>.alloc(1)
+    let result = UnsafeMutablePointer<Result>(allocatingCapacity: 1)
     result.initialize(block(arg))
     return UnsafeMutablePointer(result)
   }

Diff for: stdlib/public/core/Misc.swift

@@ -63,7 +63,7 @@ public func _autorelease(x: AnyObject) {
 func _withUninitializedString<R>(
   body: (UnsafeMutablePointer<String>) -> R
 ) -> (R, String) {
-  let stringPtr = UnsafeMutablePointer<String>.alloc(1)
+  let stringPtr = UnsafeMutablePointer<String>(allocatingCapacity: 1)
   let bodyResult = body(stringPtr)
   let stringResult = stringPtr.move()
   stringPtr.dealloc(1)

Diff for: stdlib/public/core/UnsafePointer.swift.gyb

@@ -102,10 +102,10 @@ public struct ${Self}<Pointee>
   ///
   /// - Postcondition: The pointee is allocated, but not initialized.
   @warn_unused_result
-  public static func alloc(num: Int) -> ${Self} {
-    let size = strideof(Pointee.self) * num
-    return ${Self}(
-      Builtin.allocRaw(size._builtinWordValue, Builtin.alignof(Pointee.self)))
+  public init(allocatingCapacity count: Int) {
+    let size = strideof(Pointee.self) * count
+    self._rawValue =
+      Builtin.allocRaw(size._builtinWordValue, Builtin.alignof(Pointee.self))
   }
 
   /// Deallocate uninitialized memory allocated for `count` instances

Diff for: test/1_stdlib/Builtins.swift

@@ -137,7 +137,7 @@ struct Large : P {
 struct ContainsP { var p: P }
 
 func exerciseArrayValueWitnesses<T>(value: T) {
-  let buf = UnsafeMutablePointer<T>.alloc(5)
+  let buf = UnsafeMutablePointer<T>(allocatingCapacity: 5)
 
   (buf + 0).initialize(value)
   (buf + 1).initialize(value)

Diff for: test/1_stdlib/Lazy.swift.gyb

@@ -403,7 +403,7 @@ func expectSequencePassthrough<
   }
 
   SequenceLog._initializeTo.expectIncrement(baseType) { ()->Void in
-    let buf = UnsafeMutablePointer<S.Iterator.Element>.alloc(count)
+    let buf = UnsafeMutablePointer<S.Iterator.Element>(allocatingCapacity: count)
 
     let end = s._initializeTo(buf)
     expectTrue(end <= buf + count)

Diff for: test/1_stdlib/NSStringAPI.swift

@@ -198,7 +198,7 @@ NSStringAPIs.test("init(withCString_:encoding:)") {
 
 NSStringAPIs.test("init(UTF8String:)") {
   var s = "foo あいう"
-  var up = UnsafeMutablePointer<UInt8>.alloc(100)
+  var up = UnsafeMutablePointer<UInt8>(allocatingCapacity: 100)
   var i = 0
   for b in s.utf8 {
     up[i] = b
@@ -2144,15 +2144,15 @@ func getNullCString() -> UnsafeMutablePointer<CChar> {
 }
 
 func getASCIICString() -> (UnsafeMutablePointer<CChar>, dealloc: ()->()) {
-  let up = UnsafeMutablePointer<CChar>.alloc(100)
+  let up = UnsafeMutablePointer<CChar>(allocatingCapacity: 100)
   up[0] = 0x61
   up[1] = 0x62
   up[2] = 0
   return (up, { up.dealloc(100) })
 }
 
 func getNonASCIICString() -> (UnsafeMutablePointer<CChar>, dealloc: ()->()) {
-  let up = UnsafeMutablePointer<UInt8>.alloc(100)
+  let up = UnsafeMutablePointer<UInt8>(allocatingCapacity: 100)
   up[0] = 0xd0
   up[1] = 0xb0
   up[2] = 0xd0
@@ -2163,7 +2163,7 @@ func getNonASCIICString() -> (UnsafeMutablePointer<CChar>, dealloc: ()->()) {
 
 func getIllFormedUTF8String1(
 ) -> (UnsafeMutablePointer<CChar>, dealloc: ()->()) {
-  let up = UnsafeMutablePointer<UInt8>.alloc(100)
+  let up = UnsafeMutablePointer<UInt8>(allocatingCapacity: 100)
   up[0] = 0x41
   up[1] = 0xed
   up[2] = 0xa0
@@ -2175,7 +2175,7 @@ func getIllFormedUTF8String1(
 
 func getIllFormedUTF8String2(
 ) -> (UnsafeMutablePointer<CChar>, dealloc: ()->()) {
-  let up = UnsafeMutablePointer<UInt8>.alloc(100)
+  let up = UnsafeMutablePointer<UInt8>(allocatingCapacity: 100)
   up[0] = 0x41
   up[1] = 0xed
   up[2] = 0xa0

Diff for: test/1_stdlib/Reflection.swift

@@ -204,7 +204,7 @@ var randomUnsafeMutablePointerString = UnsafeMutablePointer<String>(
 print(_reflect(randomUnsafeMutablePointerString).summary)
 
 // CHECK-NEXT: Hello panda
-var sanePointerString = UnsafeMutablePointer<String>.alloc(1)
+var sanePointerString = UnsafeMutablePointer<String>(allocatingCapacity: 1)
 sanePointerString.initialize("Hello panda")
 print(_reflect(sanePointerString.memory).summary)
 sanePointerString.destroy()

Diff for: test/1_stdlib/UnsafePointer.swift.gyb

@@ -139,7 +139,7 @@ func checkPointerCorrectness(check: Check,
   _ f: (UnsafeMutablePointer<Missile>) ->
     (UnsafeMutablePointer<Missile>, count: Int) -> Void,
   _ withMissiles: Bool = false) {
-  let ptr = UnsafeMutablePointer<Missile>.alloc(4)
+  let ptr = UnsafeMutablePointer<Missile>(allocatingCapacity: 4)
   switch check {
   case .RightOverlap:
     ptr.initialize(Missile(1))
@@ -170,7 +170,7 @@ func checkPointerCorrectness(check: Check,
     expectEqual(2, ptr[0].number)
     expectEqual(3, ptr[1].number)
     // backwards
-    let ptr2 = UnsafeMutablePointer<Missile>.alloc(4)
+    let ptr2 = UnsafeMutablePointer<Missile>(allocatingCapacity: 4)
     ptr2.initialize(Missile(0))
     (ptr2 + 1).initialize(Missile(1))
     if withMissiles {

Diff for: test/Interpreter/SDK/libc.swift

@@ -21,7 +21,7 @@ print("\(UINT32_MAX)")
 // CHECK: the magic word is ///* magic *///
 let sourceFile = open(sourcePath, O_RDONLY)
 assert(sourceFile >= 0)
-var bytes = UnsafeMutablePointer<CChar>.alloc(12)
+var bytes = UnsafeMutablePointer<CChar>(allocatingCapacity: 12)
 var readed = read(sourceFile, bytes, 11)
 close(sourceFile)
 assert(readed == 11)

Diff for: test/Prototypes/CollectionTransformers.swift

@@ -218,7 +218,7 @@ struct _ForkJoinMutex {
   var _mutex: UnsafeMutablePointer<pthread_mutex_t>
 
   init() {
-    _mutex = UnsafeMutablePointer.alloc(1)
+    _mutex = UnsafeMutablePointer(allocatingCapacity: 1)
     if pthread_mutex_init(_mutex, nil) != 0 {
       fatalError("pthread_mutex_init")
     }
@@ -248,7 +248,7 @@ struct _ForkJoinCond {
   var _cond: UnsafeMutablePointer<pthread_cond_t> = nil
 
   init() {
-    _cond = UnsafeMutablePointer.alloc(1)
+    _cond = UnsafeMutablePointer(allocatingCapacity: 1)
     if pthread_cond_init(_cond, nil) != 0 {
       fatalError("pthread_cond_init")
     }

Diff for: test/SILGen/addressors.swift

@@ -76,7 +76,7 @@ func test1() -> Int32 {
   return A()[0]
 }
 
-let uninitAddr = UnsafeMutablePointer<Int32>.alloc(1)
+let uninitAddr = UnsafeMutablePointer<Int32>(allocatingCapacity: 1)
 var global: Int32 {
   unsafeAddress {
     return UnsafePointer(uninitAddr)
@@ -251,7 +251,7 @@ func test_e(e: E) {
 }
 
 class F {
-  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer.alloc(100)
+  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer(allocatingCapacity: 100)
 
   final var value: Int32 {
     addressWithNativeOwner {
@@ -302,7 +302,7 @@ func test_f1(f: F) {
 // CHECK:   strong_release [[SELF]] : $F
 
 class G {
-  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer.alloc(100)
+  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer(allocatingCapacity: 100)
 
   var value: Int32 {
     addressWithNativeOwner {
@@ -375,7 +375,7 @@ class G {
 // CHECK:   dealloc_value_buffer $Builtin.NativeObject in [[STORAGE]] : $*Builtin.UnsafeValueBuffer
 
 class H {
-  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer.alloc(100)
+  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer(allocatingCapacity: 100)
 
   final var value: Int32 {
     addressWithPinnedNativeOwner {
@@ -426,7 +426,7 @@ func test_h1(f: H) {
 // CHECK:   strong_release [[SELF]] : $H
 
 class I {
-  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer.alloc(100)
+  var data: UnsafeMutablePointer<Int32> = UnsafeMutablePointer(allocatingCapacity: 100)
 
   var value: Int32 {
     addressWithPinnedNativeOwner {
@@ -505,7 +505,7 @@ struct RecMiddle {
   var inner: RecInner
 }
 class RecOuter {
-  var data: UnsafeMutablePointer<RecMiddle> = UnsafeMutablePointer.alloc(100)
+  var data: UnsafeMutablePointer<RecMiddle> = UnsafeMutablePointer(allocatingCapacity: 100)
   final var middle: RecMiddle {
     addressWithPinnedNativeOwner {
       return (UnsafePointer(data), Builtin.tryPin(Builtin.castToNativeObject(self)))

Diff for: validation-test/stdlib/ArrayNew.swift.gyb

@@ -1003,7 +1003,7 @@ for indexRange in [
     .code {
     let a = getBridgedNSArrayOfRefTypeVerbatimBridged(
       numElements: 0, capacity: 16)
-    let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+    let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
     a.getObjects(
       AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<0))
     expectCrashLater()
@@ -1018,7 +1018,7 @@ for indexRange in [ 0..<4, -2..<(-1), -1..<2, 2..<4, 4..<5 ] as [Range<Int>] {
     .code {
     let a = getBridgedNSArrayOfRefTypeVerbatimBridged(
       numElements: 3, capacity: 16)
-    let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+    let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
     a.getObjects(
       AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<3))
     expectCrashLater()
@@ -1029,7 +1029,7 @@ for indexRange in [ 0..<4, -2..<(-1), -1..<2, 2..<4, 4..<5 ] as [Range<Int>] {
 
 ArrayTestSuite.test("BridgedToObjC/Verbatim/getObjects") {
   let a = getBridgedNSArrayOfRefTypeVerbatimBridged(numElements: 3)
-  let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+  let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
   a.getObjects(
     AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<3))
 
@@ -1275,7 +1275,7 @@ for indexRange in [
     .code {
     let a = getBridgedNSArrayOfValueTypeCustomBridged(
       numElements: 0, capacity: 16)
-    let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+    let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
     a.getObjects(
       AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<0))
     expectCrashLater()
@@ -1290,7 +1290,7 @@ for indexRange in [ 0..<4, -2..<(-1), -1..<2, 2..<4, 4..<5 ] as [Range<Int>] {
     .code {
     let a = getBridgedNSArrayOfValueTypeCustomBridged(
       numElements: 3, capacity: 16)
-    let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+    let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
     a.getObjects(
       AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<3))
     expectCrashLater()
@@ -1301,7 +1301,7 @@ for indexRange in [ 0..<4, -2..<(-1), -1..<2, 2..<4, 4..<5 ] as [Range<Int>] {
 
 ArrayTestSuite.test("BridgedToObjC/Custom/getObjects") {
   let a = getBridgedNSArrayOfValueTypeCustomBridged(numElements: 3)
-  let buffer = UnsafeMutablePointer<AnyObject>.alloc(16)
+  let buffer = UnsafeMutablePointer<AnyObject>(allocatingCapacity: 16)
   a.getObjects(
     AutoreleasingUnsafeMutablePointer(buffer), range: NSRange(0..<3))
 

Diff for: validation-test/stdlib/CoreAudio.swift

@@ -191,7 +191,7 @@ CoreAudioTestSuite.test(
 CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.count") {
   let sizeInBytes = AudioBufferList.sizeInBytes(maximumBuffers: 16)
   let ablPtr = UnsafeMutablePointer<AudioBufferList>(
-    UnsafeMutablePointer<UInt8>.alloc(sizeInBytes))
+    UnsafeMutablePointer<UInt8>(allocatingCapacity: sizeInBytes))
 
   // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
   // the 'count' property has a nonmutating setter.
@@ -211,7 +211,7 @@ CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.count") {
 CoreAudioTestSuite.test("UnsafeMutableAudioBufferListPointer.subscript(_: Int)") {
   let sizeInBytes = AudioBufferList.sizeInBytes(maximumBuffers: 16)
   let ablPtr = UnsafeMutablePointer<AudioBufferList>(
-    UnsafeMutablePointer<UInt8>.alloc(sizeInBytes))
+    UnsafeMutablePointer<UInt8>(allocatingCapacity: sizeInBytes))
 
   // It is important that 'ablPtrWrapper' is a 'let'.  We are verifying that
   // the subscript has a nonmutating setter.

Diff for: validation-test/stdlib/Dictionary.swift

@@ -3821,9 +3821,9 @@ DictionaryTestSuite.test("dropsBridgedCache") {
 DictionaryTestSuite.test("getObjects:andKeys:") {
   let d = ([1: "one", 2: "two"] as Dictionary<Int, String>) as NSDictionary
   var keys = UnsafeMutableBufferPointer(
-    start: UnsafeMutablePointer<NSNumber>.alloc(2), count: 2)
+    start: UnsafeMutablePointer<NSNumber>(allocatingCapacity: 2), count: 2)
   var values = UnsafeMutableBufferPointer(
-    start: UnsafeMutablePointer<NSString>.alloc(2), count: 2)
+    start: UnsafeMutablePointer<NSString>(allocatingCapacity: 2), count: 2)
   var kp = AutoreleasingUnsafeMutablePointer<AnyObject?>(keys.baseAddress)
   var vp = AutoreleasingUnsafeMutablePointer<AnyObject?>(values.baseAddress)
   var null: AutoreleasingUnsafeMutablePointer<AnyObject?> = nil

Diff for: validation-test/stdlib/HashingAvalanche.swift

@@ -22,7 +22,7 @@ func avalancheTest(bits: Int, _ hashUnderTest: (UInt64) -> UInt64, _ pValue: Dou
 
   for inputBit in 0..<bits {
     // Using an array here makes the test too slow.
-    var bitFlips = UnsafeMutablePointer<Int>.alloc(bits)
+    var bitFlips = UnsafeMutablePointer<Int>(allocatingCapacity: bits)
     for i in 0..<bits {
       bitFlips[i] = 0
     }

Diff for: validation-test/stdlib/StringSlicesConcurrentAppend.swift

@@ -94,7 +94,7 @@ func sliceConcurrentAppendThread(tid: ThreadID) {
 }
 
 StringTestSuite.test("SliceConcurrentAppend") {
-  barrierVar = UnsafeMutablePointer.alloc(1)
+  barrierVar = UnsafeMutablePointer(allocatingCapacity: 1)
   barrierVar.initialize(_stdlib_pthread_barrier_t())
   var ret = _stdlib_pthread_barrier_init(barrierVar, nil, 2)
   expectEqual(0, ret)