Skip to content

Commit 2708afe

Browse files
committed
stdlib: internalize the _uninitializedCount initializer of array buffer
1 parent 901a0fb commit 2708afe

File tree

4 files changed

+17
-14
lines changed

4 files changed

+17
-14
lines changed

stdlib/public/core/ArrayBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ extension _ArrayBuffer {
254254

255255
// No contiguous storage found; we must allocate
256256
let result = _ContiguousArrayBuffer<Element>(
257-
uninitializedCount: boundsCount, minimumCapacity: 0)
257+
_uninitializedCount: boundsCount, minimumCapacity: 0)
258258

259259
// Tell Cocoa to copy the objects into our storage
260260
cocoa.buffer.getObjects(

stdlib/public/core/Arrays.swift.gyb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -782,7 +782,7 @@ public struct ${Self}<Element>
782782
// FIXME(ABI): move to an initializer on _Buffer.
783783
static internal func _copyBuffer(_ buffer: inout _Buffer) {
784784
let newBuffer = _ContiguousArrayBuffer<Element>(
785-
uninitializedCount: buffer.count, minimumCapacity: buffer.count)
785+
_uninitializedCount: buffer.count, minimumCapacity: buffer.count)
786786
buffer._copyContents(
787787
subRange: Range(buffer.indices),
788788
initializing: newBuffer.firstElementAddress)
@@ -1065,7 +1065,7 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
10651065
minimumCapacity: Int
10661066
) -> _Buffer {
10671067
let newBuffer = _ContiguousArrayBuffer<Element>(
1068-
uninitializedCount: 0, minimumCapacity: minimumCapacity)
1068+
_uninitializedCount: 0, minimumCapacity: minimumCapacity)
10691069
return _Buffer(_buffer: newBuffer, shiftedToStartIndex: 0)
10701070
}
10711071

@@ -1200,7 +1200,7 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
12001200
minimumCapacity: minimumCapacity) == nil {
12011201

12021202
let newBuffer = _ContiguousArrayBuffer<Element>(
1203-
uninitializedCount: count, minimumCapacity: minimumCapacity)
1203+
_uninitializedCount: count, minimumCapacity: minimumCapacity)
12041204

12051205
_buffer._copyContents(
12061206
subRange: Range(_buffer.indices),
@@ -1872,7 +1872,7 @@ internal func _forceCreateUniqueMutableBufferImpl<_Buffer : _ArrayBufferProtocol
18721872
? _growArrayCapacity(source.capacity) : source.capacity)
18731873

18741874
return _ContiguousArrayBuffer(
1875-
uninitializedCount: countForBuffer, minimumCapacity: minimumCapacity)
1875+
_uninitializedCount: countForBuffer, minimumCapacity: minimumCapacity)
18761876
}
18771877

18781878
internal protocol _PointerFunction {

stdlib/public/core/ContiguousArrayBuffer.swift

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,10 @@ struct _ContiguousArrayBuffer<Element> : _ArrayBufferProtocol {
191191
/// method, you must either initialize the `count` elements at the
192192
/// result's `.firstElementAddress` or set the result's `.count`
193193
/// to zero.
194-
public init(uninitializedCount: Int, minimumCapacity: Int) {
194+
internal init(
195+
_uninitializedCount uninitializedCount: Int,
196+
minimumCapacity: Int
197+
) {
195198
let realMinimumCapacity = Swift.max(uninitializedCount, minimumCapacity)
196199
if realMinimumCapacity == 0 {
197200
self = _ContiguousArrayBuffer<Element>()
@@ -248,16 +251,16 @@ struct _ContiguousArrayBuffer<Element> : _ArrayBufferProtocol {
248251
}
249252

250253
/// True, if the array is native and does not need a deferred type check.
251-
var arrayPropertyIsNativeTypeChecked: Bool {
254+
internal var arrayPropertyIsNativeTypeChecked: Bool {
252255
return true
253256
}
254257

255258
/// A pointer to the first element.
256-
public var firstElementAddress: UnsafeMutablePointer<Element> {
259+
internal var firstElementAddress: UnsafeMutablePointer<Element> {
257260
return __bufferPointer._elementPointer
258261
}
259262

260-
public var firstElementAddressIfContiguous: UnsafeMutablePointer<Element>? {
263+
internal var firstElementAddressIfContiguous: UnsafeMutablePointer<Element>? {
261264
return firstElementAddress
262265
}
263266

@@ -508,7 +511,7 @@ public func += <Element, C : Collection>(
508511
}
509512
else {
510513
var newLHS = _ContiguousArrayBuffer<Element>(
511-
uninitializedCount: newCount,
514+
_uninitializedCount: newCount,
512515
minimumCapacity: _growArrayCapacity(lhs.capacity))
513516

514517
newLHS.firstElementAddress.moveInitialize(
@@ -599,7 +602,7 @@ internal func _copyCollectionToContiguousArray<
599602
}
600603

601604
let result = _ContiguousArrayBuffer<C.Iterator.Element>(
602-
uninitializedCount: count,
605+
_uninitializedCount: count,
603606
minimumCapacity: 0)
604607

605608
var p = result.firstElementAddress
@@ -632,7 +635,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
632635
result = _ContiguousArrayBuffer()
633636
} else {
634637
result = _ContiguousArrayBuffer(
635-
uninitializedCount: initialCapacity,
638+
_uninitializedCount: initialCapacity,
636639
minimumCapacity: 0)
637640
}
638641

@@ -647,7 +650,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
647650
// Reallocate.
648651
let newCapacity = max(_growArrayCapacity(result.capacity), 1)
649652
var newResult = _ContiguousArrayBuffer<Element>(
650-
uninitializedCount: newCapacity, minimumCapacity: 0)
653+
_uninitializedCount: newCapacity, minimumCapacity: 0)
651654
p = newResult.firstElementAddress + result.capacity
652655
remainingCapacity = newResult.capacity - result.capacity
653656
newResult.firstElementAddress.moveInitialize(

stdlib/public/core/SliceBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -333,7 +333,7 @@ extension _SliceBuffer {
333333
}
334334

335335
let result = _ContiguousArrayBuffer<Element>(
336-
uninitializedCount: count,
336+
_uninitializedCount: count,
337337
minimumCapacity: 0)
338338
result.firstElementAddress.initialize(
339339
from: firstElementAddress, count: count)

0 commit comments

Comments
 (0)