From aebdd5bcdf063a1f05486108627e06fe9c35b49c Mon Sep 17 00:00:00 2001 From: Simon Pilgrim Date: Thu, 19 Nov 2015 21:50:57 +0000 Subject: [PATCH] [X86] Use existing MachineInstrBuilder::addDisp to create offseted pointer. NFC. Minor code duplication tidyup to D13988 git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@253606 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Target/X86/X86InstrInfo.cpp | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index 9cd1cd9a0fb..41675c235ff 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -5315,14 +5315,7 @@ static void addOperands(MachineInstrBuilder &MIB, ArrayRef MOs, for (unsigned i = 0; i != NumAddrOps; ++i) { const MachineOperand &MO = MOs[i]; if (i == 3 && PtrOffset != 0) { - assert((MO.isImm() || MO.isGlobal()) && - "Unexpected memory operand type"); - if (MO.isImm()) { - MIB.addImm(MO.getImm() + PtrOffset); - } else { - MIB.addGlobalAddress(MO.getGlobal(), MO.getOffset() + PtrOffset, - MO.getTargetFlags()); - } + MIB.addDisp(MO, PtrOffset); } else { MIB.addOperand(MO); } -- 2.34.1