Skip to content

Commit f5a2a81

Browse files
airspeedswiftairspeedswift
committed
Make Optional._unsafelyUnwrappedUnchecked internal.
1 parent 5bd781b commit f5a2a81

File tree

5 files changed

+26
-27
lines changed

5 files changed

+26
-27
lines changed

‎benchmark/single-source/OpaqueConsumingUsers.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ func callFrame4(_ data: Klass, _ user: ConsumingUser) {
8080

8181
@inline(never)
8282
public func run_OpaqueConsumingUsers(_ N: Int) {
83-
let d = data._unsafelyUnwrappedUnchecked
84-
let u = user._unsafelyUnwrappedUnchecked
83+
let d = data.unsafelyUnwrapped
84+
let u = user.unsafelyUnwrapped
8585
for _ in 0..<N*200000 {
8686
callFrame4(d, u)
8787
}

‎benchmark/single-source/Radix2CooleyTukey.swift

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -108,12 +108,12 @@ func testDouble(iter: Int) {
108108
let size = doubleSize
109109
let level = Int(log2(Double(doubleN)))
110110

111-
let input_real = double_input_real._unsafelyUnwrappedUnchecked
112-
let input_imag = double_input_imag._unsafelyUnwrappedUnchecked
113-
let output_real = double_output_real._unsafelyUnwrappedUnchecked
114-
let output_imag = double_output_imag._unsafelyUnwrappedUnchecked
115-
let temp_real = double_temp_real._unsafelyUnwrappedUnchecked
116-
let temp_imag = double_temp_imag._unsafelyUnwrappedUnchecked
111+
let input_real = double_input_real.unsafelyUnwrapped
112+
let input_imag = double_input_imag.unsafelyUnwrapped
113+
let output_real = double_output_real.unsafelyUnwrapped
114+
let output_imag = double_output_imag.unsafelyUnwrapped
115+
let temp_real = double_temp_real.unsafelyUnwrapped
116+
let temp_imag = double_temp_imag.unsafelyUnwrapped
117117

118118
for _ in 0..<iter {
119119
memset(UnsafeMutableRawPointer(input_real), 0, size)
@@ -224,12 +224,12 @@ func testFloat(iter: Int) {
224224
let n = floatN
225225
let size = floatSize
226226

227-
let input_real = float_input_real._unsafelyUnwrappedUnchecked
228-
let input_imag = float_input_imag._unsafelyUnwrappedUnchecked
229-
let output_real = float_output_real._unsafelyUnwrappedUnchecked
230-
let output_imag = float_output_imag._unsafelyUnwrappedUnchecked
231-
let temp_real = float_temp_real._unsafelyUnwrappedUnchecked
232-
let temp_imag = float_temp_imag._unsafelyUnwrappedUnchecked
227+
let input_real = float_input_real.unsafelyUnwrapped
228+
let input_imag = float_input_imag.unsafelyUnwrapped
229+
let output_real = float_output_real.unsafelyUnwrapped
230+
let output_imag = float_output_imag.unsafelyUnwrapped
231+
let temp_real = float_temp_real.unsafelyUnwrapped
232+
let temp_imag = float_temp_imag.unsafelyUnwrapped
233233

234234
let level = Int(log2(Float(n)))
235235

‎benchmark/single-source/StringComparison.swift

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public func setup_StringComparison_ascii() {
130130

131131
@inline(never)
132132
public func run_StringComparison_ascii(_ N: Int) {
133-
let workload = Workload_ascii._unsafelyUnwrappedUnchecked
133+
let workload = Workload_ascii.unsafelyUnwrapped
134134
let tripCount = workload.tripCount
135135
let payload = workload.payload
136136
for _ in 1...tripCount*N {
@@ -167,7 +167,7 @@ public func setup_StringComparison_latin1() {
167167

168168
@inline(never)
169169
public func run_StringComparison_latin1(_ N: Int) {
170-
let workload = Workload_latin1._unsafelyUnwrappedUnchecked
170+
let workload = Workload_latin1.unsafelyUnwrapped
171171
let tripCount = workload.tripCount
172172
let payload = workload.payload
173173
for _ in 1...tripCount*N {
@@ -204,7 +204,7 @@ public func setup_StringComparison_fastPrenormal() {
204204

205205
@inline(never)
206206
public func run_StringComparison_fastPrenormal(_ N: Int) {
207-
let workload = Workload_fastPrenormal._unsafelyUnwrappedUnchecked
207+
let workload = Workload_fastPrenormal.unsafelyUnwrapped
208208
let tripCount = workload.tripCount
209209
let payload = workload.payload
210210
for _ in 1...tripCount*N {
@@ -241,7 +241,7 @@ public func setup_StringComparison_slowerPrenormal() {
241241

242242
@inline(never)
243243
public func run_StringComparison_slowerPrenormal(_ N: Int) {
244-
let workload = Workload_slowerPrenormal._unsafelyUnwrappedUnchecked
244+
let workload = Workload_slowerPrenormal.unsafelyUnwrapped
245245
let tripCount = workload.tripCount
246246
let payload = workload.payload
247247
for _ in 1...tripCount*N {
@@ -278,7 +278,7 @@ public func setup_StringComparison_nonBMPSlowestPrenormal() {
278278

279279
@inline(never)
280280
public func run_StringComparison_nonBMPSlowestPrenormal(_ N: Int) {
281-
let workload = Workload_nonBMPSlowestPrenormal._unsafelyUnwrappedUnchecked
281+
let workload = Workload_nonBMPSlowestPrenormal.unsafelyUnwrapped
282282
let tripCount = workload.tripCount
283283
let payload = workload.payload
284284
for _ in 1...tripCount*N {
@@ -315,7 +315,7 @@ public func setup_StringComparison_emoji() {
315315

316316
@inline(never)
317317
public func run_StringComparison_emoji(_ N: Int) {
318-
let workload = Workload_emoji._unsafelyUnwrappedUnchecked
318+
let workload = Workload_emoji.unsafelyUnwrapped
319319
let tripCount = workload.tripCount
320320
let payload = workload.payload
321321
for _ in 1...tripCount*N {
@@ -352,7 +352,7 @@ public func setup_StringComparison_abnormal() {
352352

353353
@inline(never)
354354
public func run_StringComparison_abnormal(_ N: Int) {
355-
let workload = Workload_abnormal._unsafelyUnwrappedUnchecked
355+
let workload = Workload_abnormal.unsafelyUnwrapped
356356
let tripCount = workload.tripCount
357357
let payload = workload.payload
358358
for _ in 1...tripCount*N {
@@ -389,7 +389,7 @@ public func setup_StringComparison_zalgo() {
389389

390390
@inline(never)
391391
public func run_StringComparison_zalgo(_ N: Int) {
392-
let workload = Workload_zalgo._unsafelyUnwrappedUnchecked
392+
let workload = Workload_zalgo.unsafelyUnwrapped
393393
let tripCount = workload.tripCount
394394
let payload = workload.payload
395395
for _ in 1...tripCount*N {
@@ -426,7 +426,7 @@ public func setup_StringComparison_longSharedPrefix() {
426426

427427
@inline(never)
428428
public func run_StringComparison_longSharedPrefix(_ N: Int) {
429-
let workload = Workload_longSharedPrefix._unsafelyUnwrappedUnchecked
429+
let workload = Workload_longSharedPrefix.unsafelyUnwrapped
430430
let tripCount = workload.tripCount
431431
let payload = workload.payload
432432
for _ in 1...tripCount*N {

‎benchmark/single-source/StringComparison.swift.gyb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ public func setup_StringComparison_${Name}() {
6565

6666
@inline(never)
6767
public func run_StringComparison_${Name}(_ N: Int) {
68-
let workload = Workload_${Name}._unsafelyUnwrappedUnchecked
68+
let workload = Workload_${Name}.unsafelyUnwrapped
6969
let tripCount = workload.tripCount
7070
let payload = workload.payload
7171
for _ in 1...tripCount*N {

‎stdlib/public/core/Optional.swift

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -252,9 +252,8 @@ public enum Optional<Wrapped> : ExpressibleByNilLiteral {
252252
///
253253
/// This version is for internal stdlib use; it avoids any checking
254254
/// overhead for users, even in Debug builds.
255-
@inlinable
256-
public // SPI(SwiftExperimental)
257-
var _unsafelyUnwrappedUnchecked: Wrapped {
255+
@usableFromInline @inlinable
256+
internal var _unsafelyUnwrappedUnchecked: Wrapped {
258257
@inline(__always)
259258
get {
260259
if let x = self {

0 commit comments

Comments
 (0)