From 881de4d12acc3afc3973adb2701c4f5a213e8fb9 Mon Sep 17 00:00:00 2001 From: Sanjoy Das Date: Tue, 2 Feb 2016 02:32:43 +0000 Subject: [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 --- llvm/lib/Target/X86/X86InstrInfo.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'llvm/lib/Target') diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index 0c7ce7c2490..092e443d7d6 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -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; -- cgit v1.2.3