Skip to content

Commit b19f8cc

Browse files
milsemanmilseman
authored
Merge pull request #20480 from milseman/fixed_nixed
[stdlib] Expunge FixedArray from ABI
2 parents abe37b0 + 08d83d0 commit b19f8cc

File tree

2 files changed

+65
-20
lines changed

2 files changed

+65
-20
lines changed

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

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,10 @@
2121

2222
% for N in sizes:
2323

24-
@usableFromInline // FIXME(sil-serialize-all)
25-
@_fixed_layout // FIXME(sil-serialize-all)
2624
internal struct _FixedArray${N}<T> {
2725
// ABI TODO: The has assumptions about tuple layout in the ABI, namely that
2826
// they are laid out contiguously and individually addressable (i.e. strided).
2927
//
30-
@usableFromInline // FIXME(sil-serialize-all)
3128
internal var storage: (
3229
// A ${N}-wide tuple of type T
3330
% for i in range(0, N-1):
@@ -36,44 +33,35 @@ internal struct _FixedArray${N}<T> {
3633
T
3734
)
3835

39-
@usableFromInline // FIXME(sil-serialize-all)
4036
var _count: Int8
4137
}
4238

43-
4439
extension _FixedArray${N} {
45-
@inlinable // FIXME(sil-serialize-all)
4640
internal static var capacity: Int {
4741
@inline(__always) get { return ${N} }
4842
}
4943

50-
@inlinable // FIXME(sil-serialize-all)
5144
internal var capacity: Int {
5245
@inline(__always) get { return ${N} }
5346
}
5447

55-
@inlinable // FIXME(sil-serialize-all)
5648
internal var count: Int {
5749
@inline(__always) get { return Int(truncatingIfNeeded: _count) }
5850
@inline(__always) set { _count = Int8(newValue) }
5951
}
6052
}
6153

6254
extension _FixedArray${N} : RandomAccessCollection, MutableCollection {
63-
@usableFromInline
6455
internal typealias Index = Int
6556

66-
@inlinable // FIXME(sil-serialize-all)
6757
internal var startIndex : Index {
6858
return 0
6959
}
7060

71-
@inlinable // FIXME(sil-serialize-all)
7261
internal var endIndex : Index {
7362
return count
7463
}
7564

76-
@inlinable // FIXME(sil-serialize-all)
7765
internal subscript(i: Index) -> T {
7866
@inline(__always)
7967
get {
@@ -99,21 +87,18 @@ extension _FixedArray${N} : RandomAccessCollection, MutableCollection {
9987
}
10088
}
10189

102-
@inlinable // FIXME(sil-serialize-all)
10390
@inline(__always)
10491
internal func index(after i: Index) -> Index {
10592
return i+1
10693
}
10794

108-
@inlinable // FIXME(sil-serialize-all)
10995
@inline(__always)
11096
internal func index(before i: Index) -> Index {
11197
return i-1
11298
}
11399
}
114100

115101
extension _FixedArray${N} {
116-
@inlinable // FIXME(sil-serialize-all)
117102
internal mutating func append(_ newElement: T) {
118103
_sanityCheck(count < capacity)
119104
_count += 1
@@ -122,7 +107,6 @@ extension _FixedArray${N} {
122107
}
123108

124109
extension _FixedArray${N} where T : ExpressibleByIntegerLiteral {
125-
@inlinable // FIXME(sil-serialize-all)
126110
@inline(__always)
127111
internal init(count: Int) {
128112
_sanityCheck(count >= 0 && count <= _FixedArray${N}.capacity)
@@ -135,21 +119,18 @@ extension _FixedArray${N} where T : ExpressibleByIntegerLiteral {
135119
self._count = Int8(truncatingIfNeeded: count)
136120
}
137121

138-
@inlinable // FIXME(sil-serialize-all)
139122
@inline(__always)
140123
internal init() {
141124
self.init(count: 0)
142125
}
143126

144-
@inlinable // FIXME(sil-serialize-all)
145127
@inline(__always)
146128
internal init(allZeros: ()) {
147129
self.init(count: ${N})
148130
}
149131
}
150132

151133
extension _FixedArray${N} {
152-
@inlinable // FIXME(sil-serialize-all)
153134
internal mutating func withUnsafeMutableBufferPointer<R>(
154135
_ body: (UnsafeMutableBufferPointer<Element>) throws -> R
155136
) rethrows -> R {
@@ -165,7 +146,6 @@ extension _FixedArray${N} {
165146
}
166147
}
167148

168-
@inlinable // FIXME(sil-serialize-all)
169149
internal mutating func withUnsafeBufferPointer<R>(
170150
_ body: (UnsafeBufferPointer<Element>) throws -> R
171151
) rethrows -> R {

‎test/api-digester/Outputs/stability-stdlib-abi.swift.expected

Lines changed: 65 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,71 @@ Func _swift_stdlib_atomicStoreInt64(object:desired:) has been removed
5353
Func _swift_stdlib_atomicStoreUInt32(object:desired:) has been removed
5454
Func _swift_stdlib_atomicStoreUInt64(object:desired:) has been removed
5555

56+
Var _FixedArray16._count has been removed
57+
Var _FixedArray16.capacity has been removed
58+
Var _FixedArray16.count has been removed
59+
Var _FixedArray16.endIndex has been removed
60+
Var _FixedArray16.startIndex has been removed
61+
Var _FixedArray16.storage has been removed
62+
Var _FixedArray2._count has been removed
63+
Var _FixedArray2.capacity has been removed
64+
Var _FixedArray2.count has been removed
65+
Var _FixedArray2.endIndex has been removed
66+
Var _FixedArray2.startIndex has been removed
67+
Var _FixedArray2.storage has been removed
68+
Var _FixedArray4._count has been removed
69+
Var _FixedArray4.capacity has been removed
70+
Var _FixedArray4.count has been removed
71+
Var _FixedArray4.endIndex has been removed
72+
Var _FixedArray4.startIndex has been removed
73+
Var _FixedArray4.storage has been removed
74+
Var _FixedArray8._count has been removed
75+
Var _FixedArray8.capacity has been removed
76+
Var _FixedArray8.count has been removed
77+
Var _FixedArray8.endIndex has been removed
78+
Var _FixedArray8.startIndex has been removed
79+
Var _FixedArray8.storage has been removed
80+
Subscript _FixedArray16.subscript(_:) has been removed
81+
Subscript _FixedArray2.subscript(_:) has been removed
82+
Subscript _FixedArray4.subscript(_:) has been removed
83+
Subscript _FixedArray8.subscript(_:) has been removed
84+
Struct _FixedArray16 is now without @_fixed_layout
85+
Struct _FixedArray2 is now without @_fixed_layout
86+
Struct _FixedArray4 is now without @_fixed_layout
87+
Struct _FixedArray8 is now without @_fixed_layout
88+
Func _FixedArray16.append(_:) has been removed
89+
Func _FixedArray16.index(after:) has been removed
90+
Func _FixedArray16.index(before:) has been removed
91+
Func _FixedArray16.withUnsafeBufferPointer(_:) has been removed
92+
Func _FixedArray16.withUnsafeMutableBufferPointer(_:) has been removed
93+
Func _FixedArray2.append(_:) has been removed
94+
Func _FixedArray2.index(after:) has been removed
95+
Func _FixedArray2.index(before:) has been removed
96+
Func _FixedArray2.withUnsafeBufferPointer(_:) has been removed
97+
Func _FixedArray2.withUnsafeMutableBufferPointer(_:) has been removed
98+
Func _FixedArray4.append(_:) has been removed
99+
Func _FixedArray4.index(after:) has been removed
100+
Func _FixedArray4.index(before:) has been removed
101+
Func _FixedArray4.withUnsafeBufferPointer(_:) has been removed
102+
Func _FixedArray4.withUnsafeMutableBufferPointer(_:) has been removed
103+
Func _FixedArray8.append(_:) has been removed
104+
Func _FixedArray8.index(after:) has been removed
105+
Func _FixedArray8.index(before:) has been removed
106+
Func _FixedArray8.withUnsafeBufferPointer(_:) has been removed
107+
Func _FixedArray8.withUnsafeMutableBufferPointer(_:) has been removed
108+
Constructor _FixedArray16.init() has been removed
109+
Constructor _FixedArray16.init(allZeros:) has been removed
110+
Constructor _FixedArray16.init(count:) has been removed
111+
Constructor _FixedArray2.init() has been removed
112+
Constructor _FixedArray2.init(allZeros:) has been removed
113+
Constructor _FixedArray2.init(count:) has been removed
114+
Constructor _FixedArray4.init() has been removed
115+
Constructor _FixedArray4.init(allZeros:) has been removed
116+
Constructor _FixedArray4.init(count:) has been removed
117+
Constructor _FixedArray8.init() has been removed
118+
Constructor _FixedArray8.init(allZeros:) has been removed
119+
Constructor _FixedArray8.init(count:) has been removed
120+
56121
Struct Hasher._Core has removed conformance to _HasherCore
57122
Protocol _HasherCore has been removed
58123
Struct _BufferingHasher has been removed

0 commit comments

Comments
 (0)