diff options
| author | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-09 23:53:43 +0000 |
|---|---|---|
| committer | Peter Collingbourne <peter@pcc.me.uk> | 2016-11-09 23:53:43 +0000 |
| commit | 32ab3a817d4d8ae20e868e8966ceef1511a88d03 (patch) | |
| tree | 9ca9b77b41506c562b0e2c4d4cbcbc790f1f4960 /llvm/lib/Target/X86/X86InstrInfo.cpp | |
| parent | ab3f96cb21ed0bb5697bb5f92f3630d89e1e97de (diff) | |
| download | bcm5719-llvm-32ab3a817d4d8ae20e868e8966ceef1511a88d03.tar.gz bcm5719-llvm-32ab3a817d4d8ae20e868e8966ceef1511a88d03.zip | |
Re-apply r286384, "X86: Introduce the "relocImm" ComplexPattern, which represents a relocatable immediate.", with a fix for 32-bit x86.
Teach X86InstrInfo::analyzeCompare() not to crash on CMP and SUB instructions
that take a global address operand.
llvm-svn: 286420
Diffstat (limited to 'llvm/lib/Target/X86/X86InstrInfo.cpp')
| -rw-r--r-- | llvm/lib/Target/X86/X86InstrInfo.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/llvm/lib/Target/X86/X86InstrInfo.cpp b/llvm/lib/Target/X86/X86InstrInfo.cpp index fd082097f9d..cb1861934de 100644 --- a/llvm/lib/Target/X86/X86InstrInfo.cpp +++ b/llvm/lib/Target/X86/X86InstrInfo.cpp @@ -5303,6 +5303,8 @@ bool X86InstrInfo::analyzeCompare(const MachineInstr &MI, unsigned &SrcReg, case X86::CMP16ri: case X86::CMP16ri8: case X86::CMP8ri: + if (!MI.getOperand(1).isImm()) + return false; SrcReg = MI.getOperand(0).getReg(); SrcReg2 = 0; CmpMask = ~0; @@ -5334,6 +5336,8 @@ bool X86InstrInfo::analyzeCompare(const MachineInstr &MI, unsigned &SrcReg, case X86::SUB16ri: case X86::SUB16ri8: case X86::SUB8ri: + if (!MI.getOperand(2).isImm()) + return false; SrcReg = MI.getOperand(1).getReg(); SrcReg2 = 0; CmpMask = ~0; |
