Skip to content

Commit 14abac4

Browse files
committed
---
yaml --- r: 345822 b: refs/heads/master c: 2af3959 h: refs/heads/master
1 parent 8011d63 commit 14abac4

File tree

3 files changed

+28
-28
lines changed

3 files changed

+28
-28
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: a604b678b2ff7ec822ea758ca431d64ddf8227e0
2+
refs/heads/master: 2af3959253dafe2030451be22017d21c2871b8a7
33
refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
44
refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
55
refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/stdlib/public/core/ContiguousArrayBuffer.swift

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ internal var _emptyArrayStorage : __EmptyArrayStorage {
7171
}
7272

7373
// The class that implements the storage for a ContiguousArray<Element>
74-
@_fixed_layout // FIXME(sil-serialize-all)
74+
@_fixed_layout
7575
@usableFromInline
7676
internal final class _ContiguousArrayStorage<
7777
Element
7878
> : __ContiguousArrayStorageBase {
7979

80-
@inlinable // FIXME(sil-serialize-all)
80+
@inlinable
8181
deinit {
8282
_elementPointer.deinitialize(count: countAndCapacity.count)
8383
_fixLifetime(self)
@@ -654,7 +654,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
654654

655655
/// Initialize the buffer with an initial size of `initialCapacity`
656656
/// elements.
657-
@inlinable // FIXME(sil-serialize-all)
657+
@inlinable
658658
@inline(__always) // For performance reasons.
659659
internal init(initialCapacity: Int) {
660660
if initialCapacity == 0 {
@@ -670,7 +670,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
670670
}
671671

672672
/// Add an element to the buffer, reallocating if necessary.
673-
@inlinable // FIXME(sil-serialize-all)
673+
@inlinable
674674
@inline(__always) // For performance reasons.
675675
internal mutating func add(_ element: Element) {
676676
if remainingCapacity == 0 {
@@ -693,7 +693,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
693693
}
694694

695695
/// Add an element to the buffer, which must have remaining capacity.
696-
@inlinable // FIXME(sil-serialize-all)
696+
@inlinable
697697
@inline(__always) // For performance reasons.
698698
internal mutating func addWithExistingCapacity(_ element: Element) {
699699
_sanityCheck(remainingCapacity > 0,
@@ -709,7 +709,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
709709
///
710710
/// Returns the fully-initialized buffer. `self` is reset to contain an
711711
/// empty buffer and cannot be used afterward.
712-
@inlinable // FIXME(sil-serialize-all)
712+
@inlinable
713713
@inline(__always) // For performance reasons.
714714
internal mutating func finish() -> ContiguousArray<Element> {
715715
// Adjust the initialized count of the buffer.
@@ -724,7 +724,7 @@ internal struct _UnsafePartiallyInitializedContiguousArrayBuffer<Element> {
724724
///
725725
/// Returns the fully-initialized buffer. `self` is reset to contain an
726726
/// empty buffer and cannot be used afterward.
727-
@inlinable // FIXME(sil-serialize-all)
727+
@inlinable
728728
@inline(__always) // For performance reasons.
729729
internal mutating func finishWithOriginalCount() -> ContiguousArray<Element> {
730730
_sanityCheck(remainingCapacity == result.capacity - result.count,

trunk/stdlib/public/core/SliceBuffer.swift

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -64,19 +64,19 @@ internal struct _SliceBuffer<Element>
6464
}
6565
}
6666

67-
@inlinable // FIXME(sil-serialize-all)
67+
@inlinable
6868
internal var _hasNativeBuffer: Bool {
6969
return (endIndexAndFlags & 1) != 0
7070
}
7171

72-
@inlinable // FIXME(sil-serialize-all)
72+
@inlinable
7373
internal var nativeBuffer: NativeBuffer {
7474
_sanityCheck(_hasNativeBuffer)
7575
return NativeBuffer(
7676
owner as? __ContiguousArrayStorageBase ?? _emptyArrayStorage)
7777
}
7878

79-
@inlinable // FIXME(sil-serialize-all)
79+
@inlinable
8080
internal var nativeOwner: AnyObject {
8181
_sanityCheck(_hasNativeBuffer, "Expect a native array")
8282
return owner
@@ -88,7 +88,7 @@ internal struct _SliceBuffer<Element>
8888
/// - Precondition: This buffer is backed by a uniquely-referenced
8989
/// `_ContiguousArrayBuffer` and
9090
/// `insertCount <= numericCast(newValues.count)`.
91-
@inlinable // FIXME(sil-serialize-all)
91+
@inlinable
9292
internal mutating func replaceSubrange<C>(
9393
_ subrange: Range<Int>,
9494
with insertCount: Int,
@@ -125,7 +125,7 @@ internal struct _SliceBuffer<Element>
125125
/// A value that identifies the storage used by the buffer. Two
126126
/// buffers address the same elements when they have the same
127127
/// identity and count.
128-
@inlinable // FIXME(sil-serialize-all)
128+
@inlinable
129129
internal var identity: UnsafeRawPointer {
130130
return UnsafeRawPointer(firstElementAddress)
131131
}
@@ -136,12 +136,12 @@ internal struct _SliceBuffer<Element>
136136
@usableFromInline
137137
internal let subscriptBaseAddress: UnsafeMutablePointer<Element>
138138

139-
@inlinable // FIXME(sil-serialize-all)
139+
@inlinable
140140
internal var firstElementAddress: UnsafeMutablePointer<Element> {
141141
return subscriptBaseAddress + startIndex
142142
}
143143

144-
@inlinable // FIXME(sil-serialize-all)
144+
@inlinable
145145
internal var firstElementAddressIfContiguous: UnsafeMutablePointer<Element>? {
146146
return firstElementAddress
147147
}
@@ -152,7 +152,7 @@ internal struct _SliceBuffer<Element>
152152

153153
//===--- Non-essential bits ---------------------------------------------===//
154154

155-
@inlinable // FIXME(sil-serialize-all)
155+
@inlinable
156156
internal mutating func requestUniqueMutableBackingBuffer(
157157
minimumCapacity: Int
158158
) -> NativeBuffer? {
@@ -210,7 +210,7 @@ internal struct _SliceBuffer<Element>
210210
/// If this buffer is backed by a `_ContiguousArrayBuffer`
211211
/// containing the same number of elements as `self`, return it.
212212
/// Otherwise, return `nil`.
213-
@inlinable // FIXME(sil-serialize-all)
213+
@inlinable
214214
internal func requestNativeBuffer() -> _ContiguousArrayBuffer<Element>? {
215215
_invariantCheck()
216216
if _fastPath(_hasNativeBuffer && nativeBuffer.count == count) {
@@ -219,7 +219,7 @@ internal struct _SliceBuffer<Element>
219219
return nil
220220
}
221221

222-
@inlinable // FIXME(sil-serialize-all)
222+
@inlinable
223223
@discardableResult
224224
internal __consuming func _copyContents(
225225
subRange bounds: Range<Int>,
@@ -235,12 +235,12 @@ internal struct _SliceBuffer<Element>
235235
}
236236

237237
/// True, if the array is native and does not need a deferred type check.
238-
@inlinable // FIXME(sil-serialize-all)
238+
@inlinable
239239
internal var arrayPropertyIsNativeTypeChecked: Bool {
240240
return _hasNativeBuffer
241241
}
242242

243-
@inlinable // FIXME(sil-serialize-all)
243+
@inlinable
244244
internal var count: Int {
245245
get {
246246
return endIndex - startIndex
@@ -257,13 +257,13 @@ internal struct _SliceBuffer<Element>
257257

258258
/// Traps unless the given `index` is valid for subscripting, i.e.
259259
/// `startIndex ≤ index < endIndex`
260-
@inlinable // FIXME(sil-serialize-all)
260+
@inlinable
261261
internal func _checkValidSubscript(_ index : Int) {
262262
_precondition(
263263
index >= startIndex && index < endIndex, "Index out of bounds")
264264
}
265265

266-
@inlinable // FIXME(sil-serialize-all)
266+
@inlinable
267267
internal var capacity: Int {
268268
let count = self.count
269269
if _slowPath(!_hasNativeBuffer) {
@@ -277,12 +277,12 @@ internal struct _SliceBuffer<Element>
277277
return count
278278
}
279279

280-
@inlinable // FIXME(sil-serialize-all)
280+
@inlinable
281281
internal mutating func isUniquelyReferenced() -> Bool {
282282
return isKnownUniquelyReferenced(&owner)
283283
}
284284

285-
@inlinable // FIXME(sil-serialize-all)
285+
@inlinable
286286
internal func getElement(_ i: Int) -> Element {
287287
_sanityCheck(i >= startIndex, "slice index is out of range (before startIndex)")
288288
_sanityCheck(i < endIndex, "slice index is out of range")
@@ -293,7 +293,7 @@ internal struct _SliceBuffer<Element>
293293
///
294294
/// - Precondition: `position` is a valid position in `self` and
295295
/// `position != endIndex`.
296-
@inlinable // FIXME(sil-serialize-all)
296+
@inlinable
297297
internal subscript(position: Int) -> Element {
298298
get {
299299
return getElement(position)
@@ -305,7 +305,7 @@ internal struct _SliceBuffer<Element>
305305
}
306306
}
307307

308-
@inlinable // FIXME(sil-serialize-all)
308+
@inlinable
309309
internal subscript(bounds: Range<Int>) -> _SliceBuffer {
310310
get {
311311
_sanityCheck(bounds.lowerBound >= startIndex)
@@ -334,7 +334,7 @@ internal struct _SliceBuffer<Element>
334334
///
335335
/// `endIndex` is always reachable from `startIndex` by zero or more
336336
/// applications of `index(after:)`.
337-
@inlinable // FIXME(sil-serialize-all)
337+
@inlinable
338338
internal var endIndex: Int {
339339
get {
340340
return Int(endIndexAndFlags >> 1)
@@ -371,7 +371,7 @@ internal struct _SliceBuffer<Element>
371371
}
372372

373373
extension _SliceBuffer {
374-
@inlinable // FIXME(sil-serialize-all)
374+
@inlinable
375375
internal __consuming func _copyToContiguousArray() -> ContiguousArray<Element> {
376376
if _hasNativeBuffer {
377377
let n = nativeBuffer

0 commit comments

Comments
 (0)