Skip to content

Commit 6a7c8e2

Browse files
committed
[stdlib] add newly-required unsafe annotations
1 parent 1d8e465 commit 6a7c8e2

11 files changed

+19
-20
lines changed

stdlib/public/core/Array.swift

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1436,14 +1436,14 @@ extension Array: RangeReplaceableCollection {
14361436
#if _runtime(_ObjC)
14371437
if _slowPath(!_buffer._isNative) {
14381438
let buffer = _buffer.getOrAllocateAssociatedObjectBuffer()
1439-
let (pointer, count) = (buffer.firstElementAddress, buffer.count)
1439+
let (pointer, count) = unsafe (buffer.firstElementAddress, buffer.count)
14401440
let span = Span(_unsafeStart: pointer, count: count)
1441-
return _overrideLifetime(span, borrowing: self)
1441+
return unsafe _overrideLifetime(span, borrowing: self)
14421442
}
14431443
#endif
1444-
let (pointer, count) = (_buffer.firstElementAddress, _buffer.count)
1444+
let (pointer, count) = unsafe (_buffer.firstElementAddress, _buffer.count)
14451445
let span = Span(_unsafeStart: pointer, count: count)
1446-
return _overrideLifetime(span, borrowing: self)
1446+
return unsafe _overrideLifetime(span, borrowing: self)
14471447
}
14481448
}
14491449

stdlib/public/core/ArrayBuffer.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -640,7 +640,7 @@ extension _ArrayBuffer {
640640
_ body: (UnsafeBufferPointer<Element>) throws(E) -> R
641641
) throws(E) -> R {
642642
let buffer = getOrAllocateAssociatedObjectBuffer()
643-
let (pointer, count) = (buffer.firstElementAddress, buffer.count)
643+
let (pointer, count) = unsafe (buffer.firstElementAddress, buffer.count)
644644
return try unsafe body(UnsafeBufferPointer(start: pointer, count: count))
645645
}
646646

stdlib/public/core/ArraySlice.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1123,7 +1123,7 @@ extension ArraySlice: RangeReplaceableCollection {
11231123
borrowing get {
11241124
let (pointer, count) = (_buffer.firstElementAddress, _buffer.count)
11251125
let span = Span(_unsafeStart: pointer, count: count)
1126-
return _overrideLifetime(span, borrowing: self)
1126+
return unsafe _overrideLifetime(span, borrowing: self)
11271127
}
11281128
}
11291129

stdlib/public/core/CollectionOfOne.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,9 +166,9 @@ extension CollectionOfOne {
166166
@lifetime(borrow self)
167167
@_alwaysEmitIntoClient
168168
get {
169-
let pointer = UnsafePointer<Element>(Builtin.addressOfBorrow(self))
169+
let pointer = unsafe UnsafePointer<Element>(Builtin.addressOfBorrow(self))
170170
let span = Span(_unsafeStart: pointer, count: 1)
171-
return _overrideLifetime(span, borrowing: self)
171+
return unsafe _overrideLifetime(span, borrowing: self)
172172
}
173173
}
174174
}

stdlib/public/core/ContiguousArray.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1026,9 +1026,9 @@ extension ContiguousArray: RangeReplaceableCollection {
10261026
@lifetime(borrow self)
10271027
@_alwaysEmitIntoClient
10281028
borrowing get {
1029-
let (pointer, count) = (_buffer.firstElementAddress, _buffer.count)
1029+
let (pointer, count) = unsafe (_buffer.firstElementAddress, _buffer.count)
10301030
let span = Span(_unsafeStart: pointer, count: count)
1031-
return _overrideLifetime(span, borrowing: self)
1031+
return unsafe _overrideLifetime(span, borrowing: self)
10321032
}
10331033
}
10341034

stdlib/public/core/InlineArray.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -409,9 +409,8 @@ extension InlineArray where Element: ~Copyable {
409409
@lifetime(borrow self)
410410
@_alwaysEmitIntoClient
411411
borrowing get {
412-
let pointer = _address
413-
let span = Span(_unsafeStart: pointer, count: count)
414-
return _overrideLifetime(span, borrowing: self)
412+
let span = Span(_unsafeStart: _address, count: count)
413+
return unsafe _overrideLifetime(span, borrowing: self)
415414
}
416415
}
417416
}

stdlib/public/core/KeyValuePairs.swift

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,12 +132,12 @@ extension KeyValuePairs {
132132
@lifetime(borrow self)
133133
@_alwaysEmitIntoClient
134134
get {
135-
let pointer = UnsafeRawPointer(_elements._buffer.firstElementAddress)
135+
let rp = unsafe UnsafeRawPointer(_elements._buffer.firstElementAddress)
136136
let span = Span(
137-
_unsafeStart: pointer.assumingMemoryBound(to: Element.self),
137+
_unsafeStart: unsafe rp.assumingMemoryBound(to: Element.self),
138138
count: _elements.count
139139
)
140-
return _overrideLifetime(span, borrowing: self)
140+
return unsafe _overrideLifetime(span, borrowing: self)
141141
}
142142
}
143143
}

stdlib/public/core/Span/RawSpan.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ extension RawSpan {
297297
byteCount: span.count == 1 ? MemoryLayout<Element>.size
298298
: span.count &* MemoryLayout<Element>.stride
299299
)
300-
self = _overrideLifetime(rawSpan, copying: span)
300+
self = unsafe _overrideLifetime(rawSpan, copying: span)
301301
}
302302
}
303303

stdlib/public/core/Span/Span.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ extension Span where Element: BitwiseCopyable {
486486
@_alwaysEmitIntoClient
487487
get {
488488
let rawSpan = RawSpan(_elements: self)
489-
return _overrideLifetime(rawSpan, copying: self)
489+
return unsafe _overrideLifetime(rawSpan, copying: self)
490490
}
491491
}
492492
}

stdlib/public/core/UnsafeBufferPointer.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -571,7 +571,7 @@ extension Unsafe${Mutable}BufferPointer where Element: ~Copyable {
571571
@_alwaysEmitIntoClient
572572
get {
573573
let span = Span(_unsafeElements: self)
574-
return _overrideLifetime(span, borrowing: self)
574+
return unsafe _overrideLifetime(span, borrowing: self)
575575
}
576576
}
577577
}

stdlib/public/core/UnsafeRawBufferPointer.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1178,7 +1178,7 @@ extension Unsafe${Mutable}RawBufferPointer {
11781178
@_alwaysEmitIntoClient
11791179
get {
11801180
let span = RawSpan(_unsafeBytes: self)
1181-
return _overrideLifetime(span, borrowing: self)
1181+
return unsafe _overrideLifetime(span, borrowing: self)
11821182
}
11831183
}
11841184
}

0 commit comments

Comments
 (0)