Skip to content

Commit c012196

Browse files
committed
Fix some tests for armv7k
1 parent 59f2708 commit c012196

8 files changed

+10
-13
lines changed

test/IRGen/async/hop_to_executor.sil

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,14 @@ import _Concurrency
1414

1515
// CHECK-LABEL: define{{.*}} void @test_simple(
1616
// CHECK-SAME: ptr swiftasync %0, [[INT]] %1, [[INT]] %2)
17-
// CHECK: store ptr %0, ptr [[CTX_ADDR:%[0-9]+]], align 8
17+
// CHECK: store ptr %0, ptr [[CTX_ADDR:%[0-9]+]]
1818
// CHECK: [[RESUME:%[0-9]+]] = call ptr @llvm.coro.async.resume()
1919
// CHECK: call {{.*}} @llvm.coro.suspend.async{{.*}}(i32 0, ptr [[RESUME]], ptr @__swift_async_resume_get_context, ptr @test_simple.1, ptr [[RESUME]], [[INT]] %1, [[INT]] %2, ptr {{%[0-9]+}})
2020
// CHECK: [[RESUME_CTX:%[0-9]+]] = call ptr @__swift_async_resume_get_context(
21-
// CHECK: store ptr [[RESUME_CTX]], ptr [[CTX_ADDR]], align 8
22-
// CHECK: [[CTX:%[0-9+]+]] = load ptr, ptr [[CTX_ADDR]], align 8
21+
// CHECK: store ptr [[RESUME_CTX]], ptr [[CTX_ADDR]]
22+
// CHECK: [[CTX:%[0-9+]+]] = load ptr, ptr [[CTX_ADDR]]
2323
// CHECK: [[CONT_ADDR:%[0-9]+]] = getelementptr inbounds <{ ptr, ptr }>, ptr [[CTX]], i32 0, i32 1
24-
// CHECK: [[RET_CONTINUATION:%.*]] = load ptr, ptr [[CONT_ADDR]], align 8
24+
// CHECK: [[RET_CONTINUATION:%.*]] = load ptr, ptr [[CONT_ADDR]]
2525
// CHECK-arm64e: [[T0:%.*]] = ptrtoint ptr [[RET_CONTINUATION]] to i64
2626
// CHECK-arm64e: [[T1:%.*]] = call i64 @llvm.ptrauth.auth(i64 [[T0]]
2727
// CHECK-arm64e: [[RET_CONTINUATION:%.*]] = inttoptr i64 [[T1]] to ptr

test/IRGen/boxed_existential.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ entry(%x : $*T):
2626
// CHECK: [[ADDR:%.*]] = extractvalue { ptr, ptr } [[BOX_PAIR]], 1
2727
%b = alloc_existential_box $Error, $T
2828
%p = project_existential_box $T in %b : $Error
29-
// CHECK: [[INITWITHTAKE:%.*]] = load ptr, ptr %5, align 8, !invariant.load
29+
// CHECK: [[INITWITHTAKE:%.*]] = load ptr, ptr %5
3030
// CHECK: call ptr [[INITWITHTAKE]](ptr noalias [[ADDR]], ptr noalias %0, ptr %T)
3131
copy_addr [take] %x to [init] %p : $*T
3232
// CHECK: ret ptr [[BOX]]

test/IRGen/enum_resilience.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ extension ResilientMultiPayloadGenericEnum {
307307
// CHECK-LABEL: define{{( dllexport)?}}{{( protected)?}} swiftcc void @"$s15enum_resilience39constructExhaustiveWithResilientMembers010resilient_A011SimpleShapeOyF"(ptr noalias nocapture sret({{.*}}) %0)
308308
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$s16resilient_struct4SizeVMa"([[INT]] 0)
309309
// CHECK-NEXT: [[METADATA:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
310-
// CHECK-NEXT: [[WITNESSTABLE_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr [[METADATA]], i64 -1
310+
// CHECK-NEXT: [[WITNESSTABLE_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr [[METADATA]], {{(i64|i32)}} -1
311311
// CHECK-NEXT: %.valueWitnesses = load ptr, ptr [[WITNESSTABLE_ADDR]]
312312
// CHECK-NEXT: [[WITNESS_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %.valueWitnesses, i32 7
313313
// CHECK-NEXT: [[WITNESS_FN:%[0-9]+]] = load ptr, ptr [[WITNESS_ADDR]]

test/IRGen/exclusivity.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ bb0(%0 : $A):
2626
%4 = begin_access [read] [dynamic] %3 : $*Int
2727

2828
// CHECK: [[T0:%.*]] = getelementptr inbounds [[INT:%TSi]], ptr %1, i32 0, i32 0
29-
// CHECK: load i64, ptr [[T0]]
29+
// CHECK: load {{(i64|i32)}}, ptr [[T0]]
3030
%5 = load %4 : $*Int
3131

3232
// CHECK: call void @swift_endAccess(ptr [[SCRATCH0]])

test/IRGen/moveonly_split_module_source_deinit.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
// Make sure we call the deinit through the value witness table in the other module.
77

8-
// REFERRING_MODULE-LABEL: define {{.*}}swiftcc void @"$s6serverAAV4mainyyKFZ"(ptr swiftself %0, ptr noalias nocapture swifterror dereferenceable(8) %1) {{.*}}{
8+
// REFERRING_MODULE-LABEL: define {{.*}}swiftcc void @"$s6serverAAV4mainyyKFZ"(ptr swiftself %0, ptr noalias nocapture swifterror dereferenceable({{(8|4)}}) %1) {{.*}}{
99
// REFERRING_MODULE: [[SERVER:%.*]] = alloca %T6server8MoveOnlyV
1010
// REFERRING_MODULE: [[VALUE_WITNESS_TABLE:%.*]] = getelementptr inbounds ptr, ptr %"$s6server8MoveOnlyVN.valueWitnesses"
1111
// REFERRING_MODULE: [[VALUE_WITNESS:%.*]] = load ptr, ptr [[VALUE_WITNESS_TABLE]]

test/IRGen/struct_layout.sil

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,6 @@ import Swift
1111
// 64: @"$s4main14Rdar15410780_CVWV" = internal constant {{.*}} i64 16
1212

1313

14-
// 32: %T4main14Rdar15410780_AV = type <{ i2048, %Ts4Int8V }>
15-
// 32: %T4main14Rdar15410780_BV = type <{ %T4main14Rdar15410780_AVSg }>
16-
// 32: %T4main14Rdar15410780_AVSg = type <{ [257 x i8], [1 x i8] }>
1714
// 32: %T4main14Rdar15410780_CV = type <{ %TSSSg }>
1815
// 32: %TSSSg = type <{ [12 x i8] }>
1916

test/IRGen/synthesized_conformance_future.swift

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ extension Nonfinal: Encodable where T: Encodable {}
3838
func doEquality<T: Equatable>(_: T) {}
3939
// CHECK-LABEL: define{{( dllexport| protected)?}} swiftcc void @"$s30synthesized_conformance_future8equalityyyF"()
4040
public func equality() {
41-
// CHECK: [[TMP:%.*]] = alloca %TSi, align 8
41+
// CHECK: [[TMP:%.*]] = alloca %TSi
4242
// CHECK: call swiftcc void @"$s30synthesized_conformance_future6StructV1xACyxGx_tcfC"(ptr noalias nocapture {{[^,]*}}, ptr noalias nocapture [[TMP]], ptr @"$sSiN")
4343
// CHECK: [[Struct_Equatable:%.*]] = call ptr @"$s30synthesized_conformance_future6StructVySiGACyxGSQAASQRzlWl"()
4444
// CHECK-NEXT: call swiftcc void @"$s30synthesized_conformance_future10doEqualityyyxSQRzlF"(

test/IRGen/typed_boxes.sil

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ sil @pod_box_32_16 : $@convention(thin) () -> () {
3838
entry:
3939
// CHECK: [[BOX:%.*]] = call noalias ptr @swift_allocObject(ptr {{.*}} [[POD_32_16_METADATA:@metadata[0-9.]*]], {{.*}} [[WORD]] 48, [[WORD]] 15)
4040
%a = alloc_box $<τ_0_0> { var τ_0_0 } <OverAligned>
41-
// CHECK-32: [[BOX_DATA:%.*]] = getelementptr inbounds [[POD_32_16_LAYOUT:<\{ %swift.refcounted, \[32 x i8\] \}>]], ptr [[BOX]], i32 0, i32 1
41+
// CHECK-32: [[BOX_DATA:%.*]] = getelementptr inbounds [[POD_32_16_LAYOUT:<\{ %swift.refcounted, \[8 x i8\], \[32 x i8\] \}>]], ptr [[BOX]], i32 0, i32 2
4242
%b = project_box %a : $<τ_0_0> { var τ_0_0 } <OverAligned>, 0
4343
// CHECK: call void @swift_deallocUninitializedObject(ptr [[BOX]], [[WORD]] 48, [[WORD]] 15)
4444
dealloc_box %a : $<τ_0_0> { var τ_0_0 } <OverAligned>

0 commit comments

Comments
 (0)