Magic-Mirror/llvm-capstone
1
0
Fork 0
mirror of https://github.com/capstone-engine/llvm-capstone.git synced 2024-11-28 08:02:08 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

[AArch64] Fix unwind info generated by outliner.

Browse Source 
The offsets were wrong. The result is now the same as what the compiler
would generate for a function that spills lr normally.

Differential Revision: https://reviews.llvm.org/D80238
This commit is contained in:
Eli Friedman 2020-05-19 13:24:53 -07:00
parent f26bdb539e
commit b4f9b34701
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
llvm/lib/Target/AArch64/AArch64InstrInfo.cpp
View File

@ -6487,7 +6487,7 @@ void AArch64InstrInfo::buildOutlinedFrame(
// Add a CFI saying the stack was moved 16 B down.
int64_t StackPosEntry =
MF.addFrameInst(MCCFIInstruction::createDefCfaOffset(nullptr, 16));
MF.addFrameInst(MCCFIInstruction::createDefCfaOffset(nullptr, -16));
BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
.addCFIIndex(StackPosEntry)
.setMIFlags(MachineInstr::FrameSetup);
@ -6495,7 +6495,7 @@ void AArch64InstrInfo::buildOutlinedFrame(
// Add a CFI saying that the LR that we want to find is now 16 B higher than
// before.
int64_t LRPosEntry =
MF.addFrameInst(MCCFIInstruction::createOffset(nullptr, DwarfReg, 16));
MF.addFrameInst(MCCFIInstruction::createOffset(nullptr, DwarfReg, -16));
BuildMI(MBB, It, DebugLoc(), get(AArch64::CFI_INSTRUCTION))
.addCFIIndex(LRPosEntry)
.setMIFlags(MachineInstr::FrameSetup);

4
llvm/test/CodeGen/AArch64/machine-outliner-calls.mir
View File

@ -58,8 +58,8 @@ body: |
# CHECK: name: OUTLINED_FUNCTION_0
# CHECK: bb.0:
# CHECK: liveins: $x19, $x20, $x21, $x22, $x23, $x24, $x25, $x26, $x27, $x28, $d15, $d8, $d9, $d10, $d11, $d12, $d13, $d14, $lr
# CHECK-DAG: frame-setup CFI_INSTRUCTION def_cfa_offset -16
# CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $w30, 16
# CHECK-DAG: frame-setup CFI_INSTRUCTION def_cfa_offset 16
# CHECK-NEXT: frame-setup CFI_INSTRUCTION offset $w30, -16
# CHECK-NEXT: early-clobber $sp = STRXpre $lr, $sp, -16
# CHECK-NEXT: BL @baz, implicit-def dead $lr, implicit $sp
# CHECK-NEXT: $w17 = ORRWri $wzr, 1