Skip to content

Commit b8f5994

Browse files
committed
Fixup alignment on a few other allocations in the URBP tests.
Also get 80c formatting on these calls.
1 parent 67d41ac commit b8f5994

File tree

1 file changed

+75
-20
lines changed

1 file changed

+75
-20
lines changed

test/stdlib/UnsafeRawBufferPointer.swift

Lines changed: 75 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,10 @@ UnsafeRawBufferPointerTestSuite.test("nonmutating_subscript_setter") {
8383
}
8484
expectEqual(value2, value1)
8585

86-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 4, alignment: MemoryLayout<UInt>.alignment)
86+
let buffer = UnsafeMutableRawBufferPointer.allocate(
87+
byteCount: 4,
88+
alignment: MemoryLayout<UInt>.alignment
89+
)
8790
defer { buffer.deallocate() }
8891
buffer.copyBytes(from: [0, 1, 2, 3] as [UInt8])
8992
let leftBytes = buffer[0..<2]
@@ -131,7 +134,10 @@ UnsafeRawBufferPointerTestSuite.test("initFromArray") {
131134
#if !os(WASI)
132135
// Trap tests aren't available on WASI.
133136
UnsafeRawBufferPointerTestSuite.test("initializeMemory(as:from:).underflow") {
134-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 30, alignment: MemoryLayout<UInt>.alignment)
137+
let buffer = UnsafeMutableRawBufferPointer.allocate(
138+
byteCount: 30,
139+
alignment: MemoryLayout<UInt64>.alignment
140+
)
135141
defer { buffer.deallocate() }
136142
let source = stride(from: 5 as Int64, to: 0, by: -1)
137143
if _isDebugAssertConfiguration() {
@@ -147,7 +153,10 @@ UnsafeRawBufferPointerTestSuite.test("initializeMemory(as:from:).underflow") {
147153
}
148154

149155
UnsafeRawBufferPointerTestSuite.test("initializeMemory(as:from:).overflow") {
150-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 30, alignment: MemoryLayout<UInt>.alignment)
156+
let buffer = UnsafeMutableRawBufferPointer.allocate(
157+
byteCount: 30,
158+
alignment: MemoryLayout<UInt64>.alignment
159+
)
151160
defer { buffer.deallocate() }
152161
let source: [Int64] = [5, 4, 3, 2, 1]
153162
if _isDebugAssertConfiguration() {
@@ -216,7 +225,10 @@ UnsafeRawBufferPointerTestSuite.test("empty") {
216225
for _ in emptyBytes {
217226
expectUnreachable()
218227
}
219-
let emptyMutableBytes = UnsafeMutableRawBufferPointer.allocate(byteCount: 0, alignment: MemoryLayout<UInt>.alignment)
228+
let emptyMutableBytes = UnsafeMutableRawBufferPointer.allocate(
229+
byteCount: 0,
230+
alignment: MemoryLayout<UInt>.alignment
231+
)
220232
for _ in emptyMutableBytes {
221233
expectUnreachable()
222234
}
@@ -232,8 +244,10 @@ UnsafeRawBufferPointerTestSuite.test("reinterpret") {
232244
}
233245
let numPairs = 2
234246
let bytes = UnsafeMutableRawBufferPointer.allocate(
235-
byteCount: MemoryLayout<Pair>.stride * numPairs, alignment: MemoryLayout<UInt>.alignment)
236-
defer { bytes.deallocate() }
247+
byteCount: MemoryLayout<Pair>.stride * numPairs,
248+
alignment: MemoryLayout<Pair>.alignment
249+
)
250+
defer { bytes.deallocate() }
237251

238252
for i in 0..<(numPairs * 2) {
239253
bytes.storeBytes(of: Int32(i), toByteOffset: i * MemoryLayout<Int32>.stride,
@@ -262,7 +276,9 @@ UnsafeRawBufferPointerTestSuite.test("reinterpret") {
262276
UnsafeRawBufferPointerTestSuite.test("inBounds") {
263277
let numInts = 4
264278
let bytes = UnsafeMutableRawBufferPointer.allocate(
265-
byteCount: MemoryLayout<Int>.stride * numInts, alignment: MemoryLayout<UInt>.alignment)
279+
byteCount: MemoryLayout<Int>.stride * numInts,
280+
alignment: MemoryLayout<UInt>.alignment
281+
)
266282
defer { bytes.deallocate() }
267283

268284
for i in 0..<numInts {
@@ -292,7 +308,10 @@ UnsafeRawBufferPointerTestSuite.test("inBounds") {
292308
#if !os(WASI)
293309
// Trap tests aren't available on WASI.
294310
UnsafeRawBufferPointerTestSuite.test("subscript.get.underflow") {
295-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 2, alignment: MemoryLayout<UInt>.alignment)
311+
let buffer = UnsafeMutableRawBufferPointer.allocate(
312+
byteCount: 2,
313+
alignment: MemoryLayout<UInt>.alignment
314+
)
296315
defer { buffer.deallocate() }
297316

298317
let bytes = UnsafeRawBufferPointer(rebasing: buffer[1..<2])
@@ -305,7 +324,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.get.underflow") {
305324
}
306325

307326
UnsafeRawBufferPointerTestSuite.test("subscript.get.overflow") {
308-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 2, alignment: MemoryLayout<UInt>.alignment)
327+
let buffer = UnsafeMutableRawBufferPointer.allocate(
328+
byteCount: 2,
329+
alignment: MemoryLayout<UInt>.alignment
330+
)
309331
defer { buffer.deallocate() }
310332

311333
let bytes = UnsafeRawBufferPointer(rebasing: buffer[0..<1])
@@ -318,7 +340,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.get.overflow") {
318340
}
319341

320342
UnsafeRawBufferPointerTestSuite.test("subscript.set.underflow") {
321-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 2, alignment: MemoryLayout<UInt>.alignment)
343+
let buffer = UnsafeMutableRawBufferPointer.allocate(
344+
byteCount: 2,
345+
alignment: MemoryLayout<UInt>.alignment
346+
)
322347
defer { buffer.deallocate() }
323348

324349
let bytes = UnsafeMutableRawBufferPointer(rebasing: buffer[1..<2])
@@ -331,7 +356,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.set.underflow") {
331356
}
332357

333358
UnsafeRawBufferPointerTestSuite.test("subscript.set.overflow") {
334-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 2, alignment: MemoryLayout<UInt>.alignment)
359+
let buffer = UnsafeMutableRawBufferPointer.allocate(
360+
byteCount: 2,
361+
alignment: MemoryLayout<UInt>.alignment
362+
)
335363
defer { buffer.deallocate() }
336364

337365
let bytes = UnsafeMutableRawBufferPointer(rebasing: buffer[0..<1])
@@ -344,7 +372,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.set.overflow") {
344372
}
345373

346374
UnsafeRawBufferPointerTestSuite.test("subscript.range.get.underflow") {
347-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
375+
let buffer = UnsafeMutableRawBufferPointer.allocate(
376+
byteCount: 3,
377+
alignment: MemoryLayout<UInt>.alignment
378+
)
348379
defer { buffer.deallocate() }
349380

350381
let bytes = UnsafeRawBufferPointer(rebasing: buffer[1..<3])
@@ -357,7 +388,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.range.get.underflow") {
357388
}
358389

359390
UnsafeRawBufferPointerTestSuite.test("subscript.range.get.overflow") {
360-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
391+
let buffer = UnsafeMutableRawBufferPointer.allocate(
392+
byteCount: 3,
393+
alignment: MemoryLayout<UInt>.alignment
394+
)
361395
defer { buffer.deallocate() }
362396

363397
let bytes = UnsafeRawBufferPointer(rebasing: buffer[0..<2])
@@ -370,7 +404,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.range.get.overflow") {
370404
}
371405

372406
UnsafeRawBufferPointerTestSuite.test("subscript.range.set.underflow") {
373-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
407+
let buffer = UnsafeMutableRawBufferPointer.allocate(
408+
byteCount: 3,
409+
alignment: MemoryLayout<UInt>.alignment
410+
)
374411
defer { buffer.deallocate() }
375412

376413
let bytes = UnsafeMutableRawBufferPointer(rebasing: buffer[1..<3])
@@ -383,7 +420,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.range.set.underflow") {
383420
}
384421

385422
UnsafeRawBufferPointerTestSuite.test("subscript.range.set.overflow") {
386-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
423+
let buffer = UnsafeMutableRawBufferPointer.allocate(
424+
byteCount: 3,
425+
alignment: MemoryLayout<UInt>.alignment
426+
)
387427
defer { buffer.deallocate() }
388428

389429
let bytes = UnsafeMutableRawBufferPointer(rebasing: buffer[0..<2])
@@ -397,7 +437,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.range.set.overflow") {
397437
}
398438

399439
UnsafeRawBufferPointerTestSuite.test("subscript.range.narrow") {
400-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
440+
let buffer = UnsafeMutableRawBufferPointer.allocate(
441+
byteCount: 3,
442+
alignment: MemoryLayout<UInt>.alignment
443+
)
401444
defer { buffer.deallocate() }
402445

403446
if _isDebugAssertConfiguration() {
@@ -408,7 +451,10 @@ UnsafeRawBufferPointerTestSuite.test("subscript.range.narrow") {
408451
}
409452

410453
UnsafeRawBufferPointerTestSuite.test("subscript.range.wide") {
411-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
454+
let buffer = UnsafeMutableRawBufferPointer.allocate(
455+
byteCount: 3,
456+
alignment: MemoryLayout<UInt>.alignment
457+
)
412458
defer { buffer.deallocate() }
413459

414460
if _isDebugAssertConfiguration() {
@@ -434,7 +480,10 @@ UnsafeRawBufferPointerTestSuite.test("_copyContents") {
434480
#if !os(WASI)
435481
// Trap tests aren't available on WASI.
436482
UnsafeRawBufferPointerTestSuite.test("copyMemory.overflow") {
437-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
483+
let buffer = UnsafeMutableRawBufferPointer.allocate(
484+
byteCount: 3,
485+
alignment: MemoryLayout<UInt>.alignment
486+
)
438487
defer { buffer.deallocate() }
439488

440489
let bytes = buffer[0..<2]
@@ -464,7 +513,10 @@ UnsafeRawBufferPointerTestSuite.test("copyBytes.withoutContiguousStorage") {
464513
#if !os(WASI)
465514
// Trap tests aren't available on WASI.
466515
UnsafeRawBufferPointerTestSuite.test("copyBytes.sequence.overflow") {
467-
let buffer = UnsafeMutableRawBufferPointer.allocate(byteCount: 3, alignment: MemoryLayout<UInt>.alignment)
516+
let buffer = UnsafeMutableRawBufferPointer.allocate(
517+
byteCount: 3,
518+
alignment: MemoryLayout<UInt>.alignment
519+
)
468520
defer { buffer.deallocate() }
469521

470522
let bytes = buffer[0..<2]
@@ -653,7 +705,10 @@ UnsafeRawBufferPointerTestSuite.test("copy.sequence.overflow")
653705
#endif
654706

655707
UnsafeRawBufferPointerTestSuite.test("copy.overlap") {
656-
let bytes = UnsafeMutableRawBufferPointer.allocate(byteCount: 4, alignment: MemoryLayout<UInt>.alignment)
708+
let bytes = UnsafeMutableRawBufferPointer.allocate(
709+
byteCount: 4,
710+
alignment: MemoryLayout<UInt>.alignment
711+
)
657712
defer { bytes.deallocate() }
658713
// Right Overlap
659714
bytes[0] = 1

0 commit comments

Comments
 (0)