maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[X86] Fix a bug in getMemOpBaseRegImmOfs 

Fix a crash in `getMemOpBaseRegImmOfs` that happens if the base of
`MemOp` is a frame index memory operand.  The fix is to have
`getMemOpBaseRegImmOfs` bail out in such cases.  We can possibly be more
clever here, if needed.

llvm-svn: 259456
This commit is contained in:
Sanjoy Das 2016-02-02 02:32:43 +00:00
parent 5cbf5d207a
commit 881de4d12a
2 changed files with 40 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/Target/X86/X86InstrInfo.cpp
View File

@ -4604,7 +4604,11 @@ bool X86InstrInfo::getMemOpBaseRegImmOfs(MachineInstr *MemOp, unsigned &BaseReg,
MemRefBegin += X86II::getOperandBias(Desc);
BaseReg = MemOp->getOperand(MemRefBegin + X86::AddrBaseReg).getReg();
MachineOperand &BaseMO = MemOp->getOperand(MemRefBegin + X86::AddrBaseReg);
if (!BaseMO.isReg()) // Can be an MO_FrameIndex
return false;
BaseReg = BaseMO.getReg();
if (MemOp->getOperand(MemRefBegin + X86::AddrScaleAmt).getImm() != 1)
return false;

36
llvm/test/CodeGen/X86/machine-sink-and-implicit-null-checks.ll
View File

@ -27,13 +27,47 @@ define i1 @f(i8* %p0, i8* %p1) {
unreachable
}
declare void @foo()
declare token @llvm.experimental.gc.statepoint.p0f_isVoidf(i64, i32, void ()*, i32, i32, ...)
declare i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token, i32, i32) nounwind readonly
; Check for a crash. The crash is not specific to statepoints, but
; gc.statpeoint is an easy way to generate a fill instruction in
; %continue0 (which causes the llc crash).
define i1 @g(i8 addrspace(1)* %p0, i8* %p1) gc "statepoint-example" {
entry:
%c0 = icmp eq i8 addrspace(1)* %p0, null
%tok = call token (i64, i32, void ()*, i32, i32, ...) @llvm.experimental.gc.statepoint.p0f_isVoidf(i64 0, i32 0, void ()* @foo, i32 0, i32 0, i32 0, i32 0, i8 addrspace(1)* %p0)
%p0.relocated = call coldcc i8 addrspace(1)* @llvm.experimental.gc.relocate.p1i8(token %tok, i32 7, i32 7) ; (%p0, %p0)
br i1 %c0, label %throw0, label %continue0, !make.implicit !0
continue0:
%c1 = icmp eq i8* %p1, null
br i1 %c1, label %throw1, label %continue1, !make.implicit !0
continue1:
%v0 = load i8, i8 addrspace(1)* %p0.relocated
%v1 = load i8, i8* %p1
%v = icmp eq i8 %v0, %v1
ret i1 %v
throw0:
call void @throw0()
unreachable
throw1:
call void @throw1()
unreachable
}
; Check that we have two implicit null checks in @f
; CHECK: __LLVM_FaultMaps:
; CHECK-NEXT: .byte 1
; CHECK-NEXT: .byte 0
; CHECK-NEXT: .short 0
; CHECK-NEXT: .long 1
; CHECK-NEXT: .long 2
; FunctionInfo[0] =