From b1fb84dee9c3797ec2f2bfd2c9cf8e6ee0436487 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 25 Jun 2009 17:28:07 +0000 Subject: [PATCH] just eliminate the code entirely! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@74183 91177308-0d34-0410-b5e6-96231b3b80d8 --- include/llvm/CodeGen/MachineInstrBuilder.h | 29 +--------------------- lib/Target/X86/X86InstrInfo.cpp | 3 +-- 2 files changed, 2 insertions(+), 30 deletions(-) diff --git a/include/llvm/CodeGen/MachineInstrBuilder.h b/include/llvm/CodeGen/MachineInstrBuilder.h index 20a10a583ee..3f30de596a5 100644 --- a/include/llvm/CodeGen/MachineInstrBuilder.h +++ b/include/llvm/CodeGen/MachineInstrBuilder.h @@ -118,34 +118,7 @@ public: } const MachineInstrBuilder &addOperand(const MachineOperand &MO) const { - if (MO.isReg()) - return addReg(MO.getReg(), - (MO.isDef() ? RegState::Define : 0) | - (MO.isImplicit() ? RegState::Implicit : 0) | - (MO.isKill() ? RegState::Kill : 0) | - (MO.isDead() ? RegState::Dead : 0) | - (MO.isEarlyClobber() ? RegState::EarlyClobber : 0), - MO.getSubReg()); - if (MO.isImm()) - return addImm(MO.getImm()); - if (MO.isFI()) - return addFrameIndex(MO.getIndex()); - if (MO.isGlobal()) - return addGlobalAddress(MO.getGlobal(), MO.getOffset(), - MO.getTargetFlags()); - if (MO.isMBB()) - return addMBB(MO.getMBB(), MO.getTargetFlags()); - if (MO.isCPI()) - return addConstantPoolIndex(MO.getIndex(), MO.getOffset(), - MO.getTargetFlags()); - if (MO.isSymbol()) - return addExternalSymbol(MO.getSymbolName(), MO.getOffset(), - MO.getTargetFlags()); - if (MO.isJTI()) - return addJumpTableIndex(MO.getIndex(), - MO.getTargetFlags()); - - assert(0 && "Unknown operand for MachineInstrBuilder::AddOperand!"); + MI->addOperand(MO); return *this; } }; diff --git a/lib/Target/X86/X86InstrInfo.cpp b/lib/Target/X86/X86InstrInfo.cpp index 8a9b7c917b4..9e831f44f2b 100644 --- a/lib/Target/X86/X86InstrInfo.cpp +++ b/lib/Target/X86/X86InstrInfo.cpp @@ -3190,9 +3190,8 @@ unsigned X86InstrInfo::GetInstSizeInBytes(const MachineInstr *MI) const { bool IsPIC = (TM.getRelocationModel() == Reloc::PIC_); bool Is64BitMode = TM.getSubtargetImpl()->is64Bit(); unsigned Size = GetInstSizeWithDesc(*MI, &Desc, IsPIC, Is64BitMode); - if (Desc.getOpcode() == X86::MOVPC32r) { + if (Desc.getOpcode() == X86::MOVPC32r) Size += GetInstSizeWithDesc(*MI, &get(X86::POP32r), IsPIC, Is64BitMode); - } return Size; }