diff options
| author | Martin Storsjo <martin@martin.st> | 2017-09-27 06:08:23 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2017-09-27 06:08:23 +0000 |
| commit | aa1533bf9b22e79c3042dc3a01b5efdf14133dab (patch) | |
| tree | f431b7d9caf73040d2f363ff8bfa0c6aa2ec8393 /llvm/lib/Target/X86/X86ISelLowering.cpp | |
| parent | eccaf04e40f9b226474cbdc4dc8b301ff528dfe8 (diff) | |
| download | bcm5719-llvm-aa1533bf9b22e79c3042dc3a01b5efdf14133dab.tar.gz bcm5719-llvm-aa1533bf9b22e79c3042dc3a01b5efdf14133dab.zip | |
[X86] Fix SJLJ struct offsets for x86_64
This is necessary, but not sufficient, for having working SJLJ exception
handling on x86_64.
Differential Revision: https://reviews.llvm.org/D38254
llvm-svn: 314277
Diffstat (limited to 'llvm/lib/Target/X86/X86ISelLowering.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86ISelLowering.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp index 31c2b63c099..6d746f425b0 100644 --- a/llvm/lib/Target/X86/X86ISelLowering.cpp +++ b/llvm/lib/Target/X86/X86ISelLowering.cpp @@ -26464,7 +26464,7 @@ void X86TargetLowering::SetupEntryBlockForSjLj(MachineInstr &MI, } MachineInstrBuilder MIB = BuildMI(*MBB, MI, DL, TII->get(Op)); - addFrameReference(MIB, FI, 36); + addFrameReference(MIB, FI, Subtarget.is64Bit() ? 56 : 36); if (UseImmLabel) MIB.addMBB(DispatchBB); else @@ -26572,7 +26572,7 @@ X86TargetLowering::EmitSjLjDispatchBlock(MachineInstr &MI, unsigned IReg = MRI->createVirtualRegister(&X86::GR32RegClass); addFrameReference(BuildMI(DispatchBB, DL, TII->get(X86::MOV32rm), IReg), FI, - 4); + Subtarget.is64Bit() ? 8 : 4); BuildMI(DispatchBB, DL, TII->get(X86::CMP32ri)) .addReg(IReg) .addImm(LPadList.size()); |
