Skip to content

Commit 257d720

Browse files
committed
stdlib: internalize the _uninitializedCount initializer of array buffer
1 parent 0085790 commit 257d720

File tree

5 files changed

+19
-16
lines changed

5 files changed

+19
-16
lines changed

stdlib/public/core/ArrayBuffer.swift

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

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

261261
// Tell Cocoa to copy the objects into our storage
262262
cocoa.buffer.getObjects(

stdlib/public/core/ArrayCast.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public func _arrayForceCast<SourceElement, TargetElement>(
7777
}
7878

7979
var buf = _ContiguousArrayBuffer<TargetElement>(
80-
uninitializedCount: source.count, minimumCapacity: 0)
80+
_uninitializedCount: source.count, minimumCapacity: 0)
8181

8282
let _: Void = buf.withUnsafeMutableBufferPointer {
8383
var p = $0.baseAddress!
@@ -154,7 +154,7 @@ internal func _arrayConditionalBridgeElements<SourceElement, TargetElement>(
154154
_sanityCheck(!_isBridgedVerbatimToObjectiveC(TargetElement.self))
155155

156156
let buf = _ContiguousArrayBuffer<TargetElement>(
157-
uninitializedCount: source.count, minimumCapacity: 0)
157+
_uninitializedCount: source.count, minimumCapacity: 0)
158158

159159
var p = buf.firstElementAddress
160160

stdlib/public/core/Arrays.swift.gyb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -790,7 +790,7 @@ public struct ${Self}<Element>
790790
// FIXME(ABI): move to an initializer on _Buffer.
791791
static internal func _copyBuffer(_ buffer: inout _Buffer) {
792792
let newBuffer = _ContiguousArrayBuffer<Element>(
793-
uninitializedCount: buffer.count, minimumCapacity: buffer.count)
793+
_uninitializedCount: buffer.count, minimumCapacity: buffer.count)
794794
buffer._copyContents(
795795
subRange: Range(buffer.indices),
796796
initializing: newBuffer.firstElementAddress)
@@ -1073,7 +1073,7 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
10731073
minimumCapacity: Int
10741074
) -> _Buffer {
10751075
let newBuffer = _ContiguousArrayBuffer<Element>(
1076-
uninitializedCount: 0, minimumCapacity: minimumCapacity)
1076+
_uninitializedCount: 0, minimumCapacity: minimumCapacity)
10771077
return _Buffer(_buffer: newBuffer, shiftedToStartIndex: 0)
10781078
}
10791079

@@ -1208,7 +1208,7 @@ extension ${Self} : RangeReplaceableCollection, _ArrayProtocol {
12081208
minimumCapacity: minimumCapacity) == nil {
12091209

12101210
let newBuffer = _ContiguousArrayBuffer<Element>(
1211-
uninitializedCount: count, minimumCapacity: minimumCapacity)
1211+
_uninitializedCount: count, minimumCapacity: minimumCapacity)
12121212

12131213
_buffer._copyContents(
12141214
subRange: Range(_buffer.indices),
@@ -1856,7 +1856,7 @@ internal func _forceCreateUniqueMutableBufferImpl<_Buffer : _ArrayBufferProtocol
18561856
? _growArrayCapacity(source.capacity) : source.capacity)
18571857

18581858
return _ContiguousArrayBuffer(
1859-
uninitializedCount: countForBuffer, minimumCapacity: minimumCapacity)
1859+
_uninitializedCount: countForBuffer, minimumCapacity: minimumCapacity)
18601860
}
18611861

18621862
internal protocol _PointerFunction {

stdlib/public/core/ContiguousArrayBuffer.swift

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

249252
/// True, if the array is native and does not need a deferred type check.
250-
var arrayPropertyIsNativeTypeChecked: Bool {
253+
internal var arrayPropertyIsNativeTypeChecked: Bool {
251254
return true
252255
}
253256

254257
/// A pointer to the first element.
255-
public var firstElementAddress: UnsafeMutablePointer<Element> {
258+
internal var firstElementAddress: UnsafeMutablePointer<Element> {
256259
return __bufferPointer._elementPointer
257260
}
258261

259-
public var firstElementAddressIfContiguous: UnsafeMutablePointer<Element>? {
262+
internal var firstElementAddressIfContiguous: UnsafeMutablePointer<Element>? {
260263
return firstElementAddress
261264
}
262265

@@ -509,7 +512,7 @@ public func += <Element, C : Collection>(
509512
}
510513
else {
511514
var newLHS = _ContiguousArrayBuffer<Element>(
512-
uninitializedCount: newCount,
515+
_uninitializedCount: newCount,
513516
minimumCapacity: _growArrayCapacity(lhs.capacity))
514517

515518
newLHS.firstElementAddress.moveInitializeFrom(
@@ -600,7 +603,7 @@ internal func _copyCollectionToContiguousArray<
600603
}
601604

602605
let result = _ContiguousArrayBuffer<C.Iterator.Element>(
603-
uninitializedCount: count,
606+
_uninitializedCount: count,
604607
minimumCapacity: 0)
605608

606609
var p = result.firstElementAddress
@@ -633,7 +636,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
633636
result = _ContiguousArrayBuffer()
634637
} else {
635638
result = _ContiguousArrayBuffer(
636-
uninitializedCount: initialCapacity,
639+
_uninitializedCount: initialCapacity,
637640
minimumCapacity: 0)
638641
}
639642

@@ -648,7 +651,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
648651
// Reallocate.
649652
let newCapacity = max(_growArrayCapacity(result.capacity), 1)
650653
var newResult = _ContiguousArrayBuffer<Element>(
651-
uninitializedCount: newCapacity, minimumCapacity: 0)
654+
_uninitializedCount: newCapacity, minimumCapacity: 0)
652655
p = newResult.firstElementAddress + result.capacity
653656
remainingCapacity = newResult.capacity - result.capacity
654657
newResult.firstElementAddress.moveInitializeFrom(

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.initializeFrom(
339339
firstElementAddress, count: count)

0 commit comments

Comments
 (0)