Skip to content

[AArch64] fix trampoline implementation: actually use X15 #143892

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 18, 2025
Merged

[AArch64] fix trampoline implementation: actually use X15 #143892

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7154,8 +7154,7 @@ SDValue AArch64TargetLowering::LowerINIT_TRAMPOLINE(SDValue Op,
switch (CC) {
default:
NestReg = 0x0f; // X15
LLVM_FALLTHROUGH;
case CallingConv::ARM64EC_Thunk_Native:
break;
case CallingConv::ARM64EC_Thunk_X64:
// Must be kept in sync with AArch64CallingConv.td
NestReg = 0x04; // X4
Expand Down
12 changes: 6 additions & 6 deletions llvm/test/CodeGen/AArch64/trampoline.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ define i64 @func1() {
; CHECK-LINUX-NEXT: str w9, [sp, #16]
; CHECK-LINUX-NEXT: add x9, sp, #56
; CHECK-LINUX-NEXT: stp x9, x8, [sp, #24]
; CHECK-LINUX-NEXT: mov x8, #132 // =0x84
; CHECK-LINUX-NEXT: mov x8, #143 // =0x8f
; CHECK-LINUX-NEXT: movk x8, #22528, lsl #16
; CHECK-LINUX-NEXT: movk x8, #177, lsl #32
; CHECK-LINUX-NEXT: movk x8, #22528, lsl #48
Expand Down Expand Up @@ -112,7 +112,7 @@ define i64 @func1() {
; CHECK-PC-NEXT: add x0, sp, #8
; CHECK-PC-NEXT: movk w8, #54815, lsl #16
; CHECK-PC-NEXT: str w8, [sp, #16]
; CHECK-PC-NEXT: mov x8, #132 // =0x84
; CHECK-PC-NEXT: mov x8, #143 // =0x8f
; CHECK-PC-NEXT: movk x8, #22528, lsl #16
; CHECK-PC-NEXT: movk x8, #177, lsl #32
; CHECK-PC-NEXT: movk x8, #22528, lsl #48
Expand Down Expand Up @@ -148,7 +148,7 @@ define i64 @func1() {
; CHECK-APPLE-NEXT: mov x0, sp
; CHECK-APPLE-NEXT: movk w8, #54815, lsl #16
; CHECK-APPLE-NEXT: str w8, [sp, #8]
; CHECK-APPLE-NEXT: mov x8, #132 ; =0x84
; CHECK-APPLE-NEXT: mov x8, #143 ; =0x8f
; CHECK-APPLE-NEXT: movk x8, #22528, lsl #16
; CHECK-APPLE-NEXT: movk x8, #177, lsl #32
; CHECK-APPLE-NEXT: movk x8, #22528, lsl #48
Expand Down Expand Up @@ -184,7 +184,7 @@ define i64 @func2() {
; CHECK-LINUX-NEXT: add x9, sp, #8
; CHECK-LINUX-NEXT: add x1, x0, #12
; CHECK-LINUX-NEXT: stp x9, x8, [x0, #16]
; CHECK-LINUX-NEXT: mov x8, #132 // =0x84
; CHECK-LINUX-NEXT: mov x8, #143 // =0x8f
; CHECK-LINUX-NEXT: movk x8, #22528, lsl #16
; CHECK-LINUX-NEXT: movk x8, #177, lsl #32
; CHECK-LINUX-NEXT: movk x8, #22528, lsl #48
Expand All @@ -210,7 +210,7 @@ define i64 @func2() {
; CHECK-PC-NEXT: mov w8, #544 // =0x220
; CHECK-PC-NEXT: movk w8, #54815, lsl #16
; CHECK-PC-NEXT: str w8, [x0, #8]
; CHECK-PC-NEXT: mov x8, #132 // =0x84
; CHECK-PC-NEXT: mov x8, #143 // =0x8f
; CHECK-PC-NEXT: movk x8, #22528, lsl #16
; CHECK-PC-NEXT: movk x8, #177, lsl #32
; CHECK-PC-NEXT: movk x8, #22528, lsl #48
Expand Down Expand Up @@ -246,7 +246,7 @@ define i64 @func2() {
; CHECK-APPLE-NEXT: mov w8, #544 ; =0x220
; CHECK-APPLE-NEXT: movk w8, #54815, lsl #16
; CHECK-APPLE-NEXT: str w8, [x0, #8]
; CHECK-APPLE-NEXT: mov x8, #132 ; =0x84
; CHECK-APPLE-NEXT: mov x8, #143 ; =0x8f
; CHECK-APPLE-NEXT: movk x8, #22528, lsl #16
; CHECK-APPLE-NEXT: movk x8, #177, lsl #32
; CHECK-APPLE-NEXT: movk x8, #22528, lsl #48
Expand Down
Loading