Skip to content

Commit 26ec8e3

Browse files
Merge pull request #1863 from texasmichelle/missing_nodetype_main
Add missing NodeType enums
2 parents 97c1470 + 364aace commit 26ec8e3

File tree

3 files changed

+5
-3
lines changed

3 files changed

+5
-3
lines changed

clang/test/CodeGen/ptrauth-in-c-struct.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ void test_argument_SA(SA *a) {
132132
calleeSA(*a);
133133
}
134134

135-
// CHECK: define void @test_return_SA(%[[STRUCT_SA]]* noalias sret align 8 %[[AGG_RESULT:.*]], %[[STRUCT_SA]]* %[[A:.*]])
135+
// CHECK: define void @test_return_SA(%[[STRUCT_SA]]* noalias sret(%[[STRUCT_SA]]) align 8 %[[AGG_RESULT:.*]], %[[STRUCT_SA]]* %[[A:.*]])
136136
// CHECK: %[[A_ADDR:.*]] = alloca %[[STRUCT_SA]]*, align 8
137137
// CHECK: store %[[STRUCT_SA]]* %[[A]], %[[STRUCT_SA]]** %[[A_ADDR]], align 8
138138
// CHECK: %[[V0:.*]] = load %[[STRUCT_SA]]*, %[[STRUCT_SA]]** %[[A_ADDR]], align 8

clang/test/CodeGenCXX/ptrauth-member-function-pointer.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,8 +168,8 @@ typedef void (Derived0::*MethodTy1)();
168168
// Check that the sret pointer passed to the caller is forwarded to the musttail
169169
// call.
170170

171-
// CHECK: define linkonce_odr hidden void @_ZN8Derived04sretEv_vfpthunk_(%[[STRUCT_A1]]* noalias sret align 4 %[[AGG_RESULT:.*]], %[[STRUCT_DERIVED0]]* %{{.*}})
172-
// CHECK: musttail call void %{{.*}}(%[[STRUCT_A1]]* sret align 4 %[[AGG_RESULT]], %[[STRUCT_DERIVED0]]* %{{.*}}) [ "ptrauth"(i32 0, i64 %{{.*}}) ]
171+
// CHECK: define linkonce_odr hidden void @_ZN8Derived04sretEv_vfpthunk_(%[[STRUCT_A1]]* noalias sret(%[[STRUCT_A1]]) align 4 %[[AGG_RESULT:.*]], %[[STRUCT_DERIVED0]]* %{{.*}})
172+
// CHECK: musttail call void %{{.*}}(%[[STRUCT_A1]]* sret(%[[STRUCT_A1]]) align 4 %[[AGG_RESULT]], %[[STRUCT_DERIVED0]]* %{{.*}}) [ "ptrauth"(i32 0, i64 %{{.*}}) ]
173173
// CHECK-NEXT: ret void
174174

175175
// Check that the thunk function doesn't destruct the trivial_abi argument.

llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,6 +1534,8 @@ const char *AArch64TargetLowering::getTargetNodeName(unsigned Opcode) const {
15341534
case AArch64ISD::FIRST_NUMBER:
15351535
break;
15361536
MAKE_CASE(AArch64ISD::CALL)
1537+
MAKE_CASE(AArch64ISD::AUTH_CALL)
1538+
MAKE_CASE(AArch64ISD::AUTH_TC_RETURN)
15371539
MAKE_CASE(AArch64ISD::ADRP)
15381540
MAKE_CASE(AArch64ISD::ADR)
15391541
MAKE_CASE(AArch64ISD::ADDlow)

0 commit comments

Comments
 (0)