[PATCH] D38251: [X86] Remove erroneous callsite offsetting in SJLJ landing pads
Martin Storsjö via Phabricator via llvm-commits
llvm-commits at lists.llvm.org
Tue Sep 26 23:10:12 PDT 2017
This revision was automatically updated to reflect the committed changes.
Closed by commit rL314276: [X86] Remove erroneous callsite offsetting in SJLJ landing pads (authored by mstorsjo).
Changed prior to commit:
https://reviews.llvm.org/D38251?vs=116599&id=116764#toc
Repository:
rL LLVM
https://reviews.llvm.org/D38251
Files:
llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
llvm/trunk/test/CodeGen/X86/sjlj-eh.ll
Index: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
===================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
@@ -26576,17 +26576,13 @@
BuildMI(DispatchBB, DL, TII->get(X86::CMP32ri))
.addReg(IReg)
.addImm(LPadList.size());
- BuildMI(DispatchBB, DL, TII->get(X86::JA_1)).addMBB(TrapBB);
+ BuildMI(DispatchBB, DL, TII->get(X86::JAE_1)).addMBB(TrapBB);
- unsigned JReg = MRI->createVirtualRegister(&X86::GR32RegClass);
- BuildMI(DispContBB, DL, TII->get(X86::SUB32ri), JReg)
- .addReg(IReg)
- .addImm(1);
BuildMI(DispContBB, DL,
TII->get(Subtarget.is64Bit() ? X86::JMP64m : X86::JMP32m))
.addReg(0)
.addImm(Subtarget.is64Bit() ? 8 : 4)
- .addReg(JReg)
+ .addReg(IReg)
.addJumpTableIndex(MJTI)
.addReg(0);
Index: llvm/trunk/test/CodeGen/X86/sjlj-eh.ll
===================================================================
--- llvm/trunk/test/CodeGen/X86/sjlj-eh.ll
+++ llvm/trunk/test/CodeGen/X86/sjlj-eh.ll
@@ -60,13 +60,12 @@
;
; CHECK: [[RESUME]]:
; CHECK: leal -64(%ebp), %esi
-; assert(UFC.__callsite <= 1);
+; assert(UFC.__callsite < 1);
; CHECK: movl -60(%ebp), %eax
; CHECK: cmpl $1, %eax
-; CHECK: jbe [[CONT:LBB[0-9]+_[0-9]+]]
+; CHECK: jb [[CONT:LBB[0-9]+_[0-9]+]]
; CHECK: ud2
; CHECK: [[CONT]]:
-; *Handlers[--UFC.__callsite]
-; CHECK: subl $1, %eax
+; *Handlers[UFC.__callsite]
; CHECK: jmpl *LJTI
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D38251.116764.patch
Type: text/x-patch
Size: 1531 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20170927/d7ca3a7e/attachment-0001.bin>
More information about the llvm-commits
mailing list