Skip to content

Commit 8dabca1

Browse files
tayloraswifttayloraswift
committed
implement SE 184: add allocation methods to Unsafe buffer pointers, drop all parameters from deallocation, adjust namings, and add repeated-value assignment methods
1 parent 0b076fa commit 8dabca1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+559
-261
lines changed

‎stdlib/private/StdlibCollectionUnittest/CheckSequenceInstance.swift.gyb

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ public func checkSequence<
9595
"_copyContents failed to use entire buffer")
9696
expectEqualSequence(expected, buf, ${trace}, sameValue: sameValue)
9797
ptr.deinitialize(count: count)
98-
ptr.deallocate(capacity: count)
98+
ptr.deallocate()
9999
}
100100

101101
// Test `_copyToContiguousArray()` if we can do so
@@ -124,4 +124,3 @@ public func checkSequence<
124124
}
125125

126126
% end
127-

‎stdlib/private/StdlibUnittest/OpaqueIdentityFunctions.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@ public func _opaqueIdentity<T>(_ x: T) -> T {
1818
ptr.initialize(to: x)
1919
let result =
2020
UnsafeMutablePointer<T>(_getPointer(OpaquePointer(ptr))).pointee
21-
ptr.deinitialize()
22-
ptr.deallocate(capacity: 1)
21+
ptr.deinitialize(count: 1)
22+
ptr.deallocate()
2323
return result
2424
}
2525

@@ -79,4 +79,3 @@ public func getFloat80(_ x: Float80) -> Float80 { return _opaqueIdentity(x) }
7979
public func getPointer(_ x: OpaquePointer) -> OpaquePointer {
8080
return _opaqueIdentity(x)
8181
}
82-

‎stdlib/private/SwiftPrivate/ShardedAtomicCounter.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public struct _stdlib_ShardedAtomicCounter {
4343

4444
public func `deinit`() {
4545
self._shardsPtr.deinitialize(count: self._shardsCount)
46-
self._shardsPtr.deallocate(capacity: self._shardsCount)
46+
self._shardsPtr.deallocate()
4747
}
4848

4949
public func add(_ operand: Int, randomInt: Int) {

‎stdlib/private/SwiftPrivatePthreadExtras/PthreadBarriers.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -97,10 +97,10 @@ public func _stdlib_pthread_barrier_destroy(
9797
// FIXME: leaking memory.
9898
return -1
9999
}
100-
barrier.pointee.cond!.deinitialize()
101-
barrier.pointee.cond!.deallocate(capacity: 1)
102-
barrier.pointee.mutex!.deinitialize()
103-
barrier.pointee.mutex!.deallocate(capacity: 1)
100+
barrier.pointee.cond!.deinitialize(count: 1)
101+
barrier.pointee.cond!.deallocate()
102+
barrier.pointee.mutex!.deinitialize(count: 1)
103+
barrier.pointee.mutex!.deallocate()
104104
return 0
105105
}
106106

‎stdlib/private/SwiftPrivatePthreadExtras/SwiftPrivatePthreadExtras.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public func _stdlib_pthread_join<Result>(
107107
let threadResultPtr = threadResultRawPtr!.assumingMemoryBound(
108108
to: Result.self)
109109
let threadResult = threadResultPtr.pointee
110-
threadResultPtr.deinitialize()
111-
threadResultPtr.deallocate(capacity: 1)
110+
threadResultPtr.deinitialize(count: 1)
111+
threadResultPtr.deallocate()
112112
return (result, threadResult)
113113
} else {
114114
return (result, nil)

‎stdlib/private/SwiftReflectionTest/SwiftReflectionTest.swift

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ public func reflect<T>(any: T) {
361361
anyPointer.initialize(to: any)
362362
let anyPointerValue = UInt(bitPattern: anyPointer)
363363
reflect(instanceAddress: anyPointerValue, kind: .Existential)
364-
anyPointer.deallocate(capacity: MemoryLayout<Any>.size)
364+
anyPointer.deallocate()
365365
}
366366

367367
// Reflect an `Error`, a.k.a. an "error existential".
@@ -431,7 +431,7 @@ public func reflect(function: @escaping () -> Void) {
431431

432432
reflect(instanceAddress: contextPointer, kind: .Object)
433433

434-
fn.deallocate(capacity: MemoryLayout<ThickFunction0>.size)
434+
fn.deallocate()
435435
}
436436

437437
/// Reflect a closure context. The given function must be a Swift-native
@@ -449,7 +449,7 @@ public func reflect(function: @escaping (Int) -> Void) {
449449

450450
reflect(instanceAddress: contextPointer, kind: .Object)
451451

452-
fn.deallocate(capacity: MemoryLayout<ThickFunction1>.size)
452+
fn.deallocate()
453453
}
454454

455455
/// Reflect a closure context. The given function must be a Swift-native
@@ -466,7 +466,7 @@ public func reflect(function: @escaping (Int, String) -> Void) {
466466

467467
reflect(instanceAddress: contextPointer, kind: .Object)
468468

469-
fn.deallocate(capacity: MemoryLayout<ThickFunction2>.size)
469+
fn.deallocate()
470470
}
471471

472472
/// Reflect a closure context. The given function must be a Swift-native
@@ -483,7 +483,7 @@ public func reflect(function: @escaping (Int, String, AnyObject?) -> Void) {
483483

484484
reflect(instanceAddress: contextPointer, kind: .Object)
485485

486-
fn.deallocate(capacity: MemoryLayout<ThickFunction3>.size)
486+
fn.deallocate()
487487
}
488488

489489
/// Call this function to indicate to the parent that there are

‎stdlib/public/SDK/Foundation/Data.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ public final class _DataStorage {
137137
}
138138
return try apply(UnsafeRawBufferPointer(start: d.bytes.advanced(by: range.lowerBound - _offset), count: Swift.min(range.count, len)))
139139
} else {
140-
var buffer = UnsafeMutableRawBufferPointer.allocate(count: range.count)
140+
var buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: range.count, alignment: MemoryLayout<UInt>.alignment)
141141
defer { buffer.deallocate() }
142142
let sliceRange = NSRange(location: range.lowerBound - _offset, length: range.count)
143143
var enumerated = 0
@@ -168,7 +168,7 @@ public final class _DataStorage {
168168
}
169169
return try apply(UnsafeRawBufferPointer(start: d.bytes.advanced(by: range.lowerBound - _offset), count: Swift.min(range.count, len)))
170170
} else {
171-
var buffer = UnsafeMutableRawBufferPointer.allocate(count: range.count)
171+
var buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: range.count, alignment: MemoryLayout<UInt>.alignment)
172172
defer { buffer.deallocate() }
173173
let sliceRange = NSRange(location: range.lowerBound - _offset, length: range.count)
174174
var enumerated = 0

‎stdlib/public/SDK/Foundation/NSDictionary.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ extension NSDictionary {
224224

225225
// Allocate a buffer containing both the keys and values.
226226
let buffer = UnsafeMutableRawPointer.allocate(
227-
bytes: totalSize, alignedTo: alignment)
227+
byteCount: totalSize, alignment: alignment)
228228
defer {
229-
buffer.deallocate(bytes: totalSize, alignedTo: alignment)
229+
buffer.deallocate()
230230
_fixLifetime(otherDictionary)
231231
}
232232

‎stdlib/public/SDK/Foundation/NSSet.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -177,9 +177,9 @@ extension NSSet {
177177
assert(alignment == MemoryLayout<AnyObject>.alignment)
178178

179179
let rawBuffer = UnsafeMutableRawPointer.allocate(
180-
bytes: bufferSize, alignedTo: alignment)
180+
byteCount: bufferSize, alignment: alignment)
181181
defer {
182-
rawBuffer.deallocate(bytes: bufferSize, alignedTo: alignment)
182+
rawBuffer.deallocate()
183183
_fixLifetime(anSet)
184184
}
185185
let valueBuffer = rawBuffer.bindMemory(

‎stdlib/public/core/HashedCollections.swift.gyb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3314,7 +3314,7 @@ internal class _TypedNative${Self}Storage<${TypeParameters}> :
33143314
if !_isPOD(Key.self) {
33153315
for i in 0 ..< capacity {
33163316
if initializedEntries[i] {
3317-
(keys+i).deinitialize()
3317+
(keys+i).deinitialize(count: 1)
33183318
}
33193319
}
33203320
}
@@ -3323,7 +3323,7 @@ internal class _TypedNative${Self}Storage<${TypeParameters}> :
33233323
if !_isPOD(Value.self) {
33243324
for i in 0 ..< capacity {
33253325
if initializedEntries[i] {
3326-
(values+i).deinitialize()
3326+
(values+i).deinitialize(count: 1)
33273327
}
33283328
}
33293329
}
@@ -3728,9 +3728,9 @@ internal struct _Native${Self}Buffer<${TypeParameters}> {
37283728
_sanityCheck(isInitializedEntry(at: i))
37293729
defer { _fixLifetime(self) }
37303730

3731-
(keys + i).deinitialize()
3731+
(keys + i).deinitialize(count: 1)
37323732
%if Self == 'Dictionary':
3733-
(values + i).deinitialize()
3733+
(values + i).deinitialize(count: 1)
37343734
%end
37353735
_storage.initializedEntries[i] = false
37363736
}

‎stdlib/public/core/KeyPath.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1526,7 +1526,7 @@ internal struct KeyPathBuffer {
15261526
src: UnsafeMutableRawPointer(mutating: raw.baseAddress.unsafelyUnwrapped),
15271527
size: UInt(MemoryLayout<T>.size))
15281528
let result = resultBuf.pointee
1529-
resultBuf.deallocate(capacity: 1)
1529+
resultBuf.deallocate()
15301530
return result
15311531
}
15321532
@_inlineable // FIXME(sil-serialize-all)

‎stdlib/public/core/ManagedBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ open class ManagedBuffer<Header, Element> {
162162
/// Manager(unsafeBufferObject: self).withUnsafeMutablePointers {
163163
/// (pointerToHeader, pointerToElements) -> Void in
164164
/// pointerToElements.deinitialize(count: self.count)
165-
/// pointerToHeader.deinitialize()
165+
/// pointerToHeader.deinitialize(count: 1)
166166
/// }
167167
/// }
168168
///

‎stdlib/public/core/Misc.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ internal func _withUninitializedString<R>(
6969
let stringPtr = UnsafeMutablePointer<String>.allocate(capacity: 1)
7070
let bodyResult = body(stringPtr)
7171
let stringResult = stringPtr.move()
72-
stringPtr.deallocate(capacity: 1)
72+
stringPtr.deallocate()
7373
return (bodyResult, stringResult)
7474
}
7575

‎stdlib/public/core/StringCore.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -718,8 +718,8 @@ extension _StringCore : RangeReplaceableCollection {
718718
let tailStart = rangeStart + (replacedCount &<< elementShift)
719719

720720
if growth > 0 {
721-
(tailStart + (growth &<< elementShift)).copyBytes(
722-
from: tailStart, count: tailCount &<< elementShift)
721+
(tailStart + (growth &<< elementShift)).copyMemory(
722+
from: tailStart, byteCount: tailCount &<< elementShift)
723723
}
724724

725725
if _fastPath(elementWidth == 1) {
@@ -738,8 +738,8 @@ extension _StringCore : RangeReplaceableCollection {
738738
}
739739

740740
if growth < 0 {
741-
(tailStart + (growth &<< elementShift)).copyBytes(
742-
from: tailStart, count: tailCount &<< elementShift)
741+
(tailStart + (growth &<< elementShift)).copyMemory(
742+
from: tailStart, byteCount: tailCount &<< elementShift)
743743
}
744744
}
745745
else {

‎stdlib/public/core/SwiftNativeNSArray.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,9 +101,9 @@ extension _SwiftNativeNSArrayWithContiguousStorage : _NSArrayCore {
101101
// These objects are "returned" at +0, so treat them as pointer values to
102102
// avoid retains. Copy bytes via a raw pointer to circumvent reference
103103
// counting while correctly aliasing with all other pointer types.
104-
UnsafeMutableRawPointer(aBuffer).copyBytes(
104+
UnsafeMutableRawPointer(aBuffer).copyMemory(
105105
from: objects.baseAddress! + range.location,
106-
count: range.length * MemoryLayout<AnyObject>.stride)
106+
byteCount: range.length * MemoryLayout<AnyObject>.stride)
107107
}
108108
}
109109

‎stdlib/public/core/ThreadLocalStorage.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ internal func _destroyTLS(_ ptr: UnsafeMutableRawPointer?) {
121121
let tlsPtr = ptr!.assumingMemoryBound(to: _ThreadLocalStorage.self)
122122
__swift_stdlib_ubrk_close(tlsPtr[0].uBreakIterator)
123123
tlsPtr.deinitialize(count: 1)
124-
tlsPtr.deallocate(capacity: 1)
124+
tlsPtr.deallocate()
125125

126126
#if INTERNAL_CHECKS_ENABLED
127127
// Log the fact we've destroyed our storage
@@ -167,4 +167,3 @@ internal func _initializeThreadLocalStorage()
167167
_sanityCheck(success == 0, "setspecific failed")
168168
return tlsPtr
169169
}
170-

‎stdlib/public/core/UnsafeBitMap.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ struct _UnsafeBitMap {
5858
@_inlineable // FIXME(sil-serialize-all)
5959
public // @testable
6060
func initializeToZero() {
61-
values.initialize(to: 0, count: numberOfWords)
61+
values.initialize(repeating: 0, count: numberOfWords)
6262
}
6363

6464
@_inlineable // FIXME(sil-serialize-all)
@@ -82,4 +82,3 @@ struct _UnsafeBitMap {
8282
}
8383
}
8484
}
85-

0 commit comments

Comments
 (0)