Skip to content

Commit 2d75cf5

Browse files
Merge pull request #69748 from aschwaighofer/fix_enum_tests_arm64e
Fix enum tests on arm64e
2 parents 446dfbf + 0ddc5c4 commit 2d75cf5

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

test/IRGen/enum_dynamic_multi_payload.sil

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -331,7 +331,7 @@ entry(%a : $*EitherOr<T, Builtin.Int64>, %b : $*EitherOr<T, Builtin.Int64>):
331331
// CHECK: [[COND:%.*]] = icmp ne i32 [[TAG]], 0
332332
// CHECK-NEXT: br i1 [[COND]], label %[[NOOP:[0-9]+]], label %[[LEFT:[0-9]+]]
333333
// CHECK: [[LEFT]]:
334-
// CHECK: [[DESTROYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %T.valueWitnesses, i32 1
334+
// CHECK: [[DESTROYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 1
335335
// CHECK: [[DESTROY:%[^,]+]] = load ptr, ptr [[DESTROYADDR]]
336336
// CHECK: call void [[DESTROY]](ptr noalias {{%[0-9]+}}, ptr %T)
337337
// CHECK: br label %[[NOOP]]
@@ -343,7 +343,7 @@ entry(%a : $*EitherOr<T, Builtin.Int64>, %b : $*EitherOr<T, Builtin.Int64>):
343343
// CHECK: [[COND:%.*]] = icmp ne i32 [[TAG]], 0
344344
// CHECK-NEXT: br i1 [[COND]], label %[[TRIVIAL:[0-9]+]], label %[[LEFT:[0-9]+]]
345345
// CHECK: [[LEFT]]:
346-
// CHECK: [[INITWITHTAKEADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %T.valueWitnesses, i32 4
346+
// CHECK: [[INITWITHTAKEADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 4
347347
// CHECK: [[INITWITHTAKE:%[^,]+]] = load ptr, ptr [[INITWITHTAKEADDR]]
348348
// CHECK: {{%[0-9]+}} = call ptr [[INITWITHTAKE]](ptr noalias {{%[0-9]+}}, ptr noalias {{%[0-9]+}}, ptr %T)
349349
// CHECK: br label %[[DONE:[0-9]+]]
@@ -370,7 +370,7 @@ entry(%a : $*EitherOr<T, C>, %b : $*EitherOr<T, C>):
370370
// CHECK-NEXT: i32 1, label %[[RIGHT:[0-9]+]]
371371
// CHECK-NEXT: ]
372372
// CHECK: [[LEFT]]:
373-
// CHECK: [[DESTROYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %T.valueWitnesses, i32 1
373+
// CHECK: [[DESTROYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 1
374374
// CHECK: [[DESTROY:%[^,]+]] = load ptr, ptr [[DESTROYADDR]]
375375
// CHECK: call void [[DESTROY]](ptr noalias {{%[0-9]+}}, ptr %T)
376376
// CHECK: br label %[[NOOP]]
@@ -384,7 +384,7 @@ entry(%a : $*EitherOr<T, C>, %b : $*EitherOr<T, C>):
384384
// CHECK: [[COND:%.*]] = icmp ne i32 [[TAG]], 0
385385
// CHECK-NEXT: br i1 [[COND]], label %[[TRIVIAL:[0-9]+]], label %[[LEFT:[0-9]+]]
386386
// CHECK: [[LEFT]]:
387-
// CHECK: [[INITWITHTAKEADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %T.valueWitnesses, i32 4
387+
// CHECK: [[INITWITHTAKEADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 4
388388
// CHECK: [[INITWITHTAKE:%[^,]+]] = load ptr, ptr [[INITWITHTAKEADDR]]
389389
// CHECK: {{%[0-9]+}} = call ptr [[INITWITHTAKE]](ptr noalias {{%[0-9]+}}, ptr noalias {{%[0-9]+}}, ptr %T)
390390
// CHECK: br label %[[DONE:[0-9]+]]
@@ -401,7 +401,7 @@ entry(%a : $*EitherOr<T, C>, %b : $*EitherOr<T, C>):
401401
// CHECK-NEXT: i32 1, label %[[RIGHT:[0-9]+]]
402402
// CHECK-NEXT: ]
403403
// CHECK: [[LEFT]]:
404-
// CHECK: [[INITWITHCOPYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %T.valueWitnesses, i32 2
404+
// CHECK: [[INITWITHCOPYADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 2
405405
// CHECK: [[INITWITHCOPY:%[^,]+]] = load ptr, ptr [[INITWITHCOPYADDR]]
406406
// CHECK: {{%[0-9]+}} = call ptr [[INITWITHCOPY]](ptr noalias {{%[0-9]+}}, ptr noalias {{%[0-9]+}}, ptr %T)
407407
// CHECK: br label %[[DONE:[0-9]+]]

test/IRGen/enum_resilience.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -308,8 +308,7 @@ extension ResilientMultiPayloadGenericEnum {
308308
// CHECK: [[T0:%.*]] = call swiftcc %swift.metadata_response @"$s16resilient_struct4SizeVMa"([[INT]] 0)
309309
// CHECK-NEXT: [[METADATA:%.*]] = extractvalue %swift.metadata_response [[T0]], 0
310310
// CHECK-NEXT: [[WITNESSTABLE_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr [[METADATA]], {{(i64|i32)}} -1
311-
// CHECK-NEXT: %.valueWitnesses = load ptr, ptr [[WITNESSTABLE_ADDR]]
312-
// CHECK-NEXT: [[WITNESS_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr %.valueWitnesses, i32 7
311+
// CHECK: [[WITNESS_ADDR:%[0-9]+]] = getelementptr inbounds ptr, ptr {{.*}}, i32 7
313312
// CHECK-NEXT: [[WITNESS_FN:%[^,]+]] = load ptr, ptr [[WITNESS_ADDR]]
314313
// CHECK-arm64e-NEXT: ptrtoint ptr {{.*}} to i64
315314
// CHECK-arm64e-NEXT: call i64 @llvm.ptrauth.blend

0 commit comments

Comments
 (0)