Skip to content

Commit 259b4c3

Browse files
authored
Merge pull request #63918 from aschwaighofer/fix_ptrauth_tests_for_changed_full_typemetadata_layout
Adjust test/IRGen/ptrauth-foreign.sil and test/IRGen/ptrauth-class-methods.sil for changed layout of type metadata after #63813
2 parents 6dbdfc8 + f8f1e52 commit 259b4c3

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

test/IRGen/ptrauth-class-methods.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55

66
import Builtin
77

8-
// CHECK: @"$s4test1ACfD.ptrauth" = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1AC*)* @"$s4test1ACfD" to i8*), i32 0, i64 ptrtoint ({{.*}} @"$s4test1ACMf" to i64), i64 48063 }, section "llvm.ptrauth", align 8
8+
// CHECK: @"$s4test1ACfD.ptrauth" = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1AC*)* @"$s4test1ACfD" to i8*), i32 0, i64 ptrtoint ({{.*}} @"$s4test1ACMf", i32 0, i32 1) to i64), i64 48063 }, section "llvm.ptrauth", align 8
99
// CHECK: @A_foo.ptrauth = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1AC*)* @A_foo to i8*), i32 0, i64 ptrtoint ({{.*}} getelementptr inbounds ({{.*}} @"$s4test1ACMf", i32 0, i32 {{.*}}) to i64), i64 23008 }, section "llvm.ptrauth", align 8
10-
// CHECK: @"$s4test1BCfD.ptrauth" = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1BC*)* @"$s4test1BCfD" to i8*), i32 0, i64 ptrtoint ({{.*}} @"$s4test1BCMf" to i64), i64 48063 }, section "llvm.ptrauth", align 8
10+
// CHECK: @"$s4test1BCfD.ptrauth" = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1BC*)* @"$s4test1BCfD" to i8*), i32 0, i64 ptrtoint ({{.*}} @"$s4test1BCMf", i32 0, i32 1) to i64), i64 48063 }, section "llvm.ptrauth", align 8
1111
// CHECK: @B_foo.ptrauth = private constant { i8*, i32, i64, i64 } { i8* bitcast (void (%T4test1BC*)* @B_foo to i8*), i32 0, i64 ptrtoint ({{.*}} getelementptr inbounds ({{.*}} @"$s4test1BCMf", i32 0, i32 {{.*}}) to i64), i64 23008 }, section "llvm.ptrauth", align 8
1212

1313
// CHECK: @"$s4test1GCMn" =

test/IRGen/ptrauth-foreign.sil

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ bb0:
99

1010
// CHECK: @"$sSo9WidgetRefaMn.ptrauth" =
1111
// CHECK-SAME: @"$sSo9WidgetRefaMn"
12-
// CHECK-SAME: @"$sSo9WidgetRefaMf", i32 0, i32 2
12+
// CHECK-SAME: @"$sSo9WidgetRefaMf", i32 0, i32 3
1313
// CHECK-SAME: i64 44678
1414
// CHECK-SAME: section "llvm.ptrauth"
1515
// CHECK: @"$sSo9WidgetRefaMf" = linkonce_odr hidden constant
@@ -18,7 +18,7 @@ bb0:
1818

1919
// CHECK: @"$sSo7IntPairVMn.ptrauth" =
2020
// CHECK-SAME: @"$sSo7IntPairVMn"
21-
// CHECK-SAME: @"$sSo7IntPairVMf", i32 0, i32 2
21+
// CHECK-SAME: @"$sSo7IntPairVMf", i32 0, i32 3
2222
// CHECK-SAME: i64 44678
2323
// CHECK-SAME: section "llvm.ptrauth"
2424
// CHECK: @"$sSo7IntPairVMf" = linkonce_odr hidden constant

0 commit comments

Comments
 (0)