Skip to content

[RISCV] fix SP recovery in varargs functions #114316

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
Nov 6, 2024
+2 −4
Merged

[RISCV] fix SP recovery in varargs functions #114316

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
4 changes: 1 addition & 3 deletions llvm/lib/Target/RISCV/RISCVFrameLowering.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -872,9 +872,7 @@ void RISCVFrameLowering::emitEpilogue(MachineFunction &MF,
uint64_t StackSize = FirstSPAdjustAmount ? FirstSPAdjustAmount
: getStackSizeWithRVVPadding(MF) -
RVFI->getReservedSpillsSize();
uint64_t FPOffset = FirstSPAdjustAmount ? FirstSPAdjustAmount
: getStackSizeWithRVVPadding(MF) -
RVFI->getVarArgsSaveSize();
uint64_t FPOffset = RealStackSize - RVFI->getVarArgsSaveSize();
uint64_t RVVStackSize = RVFI->getRVVStackSize();

bool RestoreSPFromFP = RI->hasStackRealignment(MF) ||
Expand Down
2 changes: 1 addition & 1 deletion llvm/test/CodeGen/RISCV/varargs-with-fp-and-second-adj.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ define dso_local void @_Z3fooPKcz(ptr noundef %0, ...) "frame-pointer"="all" {
; RV64V-NEXT: sd a0, -32(s0)
; RV64V-NEXT: addi a0, s0, 8
; RV64V-NEXT: sd a0, -40(s0)
; RV64V-NEXT: addi sp, s0, -496
; RV64V-NEXT: addi sp, s0, -432
; RV64V-NEXT: .cfi_def_cfa sp, 496
; RV64V-NEXT: ld ra, 424(sp) # 8-byte Folded Reload
; RV64V-NEXT: ld s0, 416(sp) # 8-byte Folded Reload
Expand Down
Loading