Remove the uses of getSubtargetImpl from InstrEmitter and remove

the now unused TargetMachine variable.

llvm-svn: 219379
This commit is contained in:
Eric Christopher 2014-10-09 01:35:29 +00:00
parent 85de8f98a9
commit 147c2ea05a
2 changed files with 6 additions and 9 deletions

View File

@ -27,7 +27,6 @@
#include "llvm/Support/MathExtras.h"
#include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetLowering.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetSubtargetInfo.h"
using namespace llvm;
@ -407,11 +406,10 @@ void InstrEmitter::AddOperand(MachineInstrBuilder &MIB,
Type *Type = CP->getType();
// MachineConstantPool wants an explicit alignment.
if (Align == 0) {
Align =
TM->getSubtargetImpl()->getDataLayout()->getPrefTypeAlignment(Type);
Align = MF->getSubtarget().getDataLayout()->getPrefTypeAlignment(Type);
if (Align == 0) {
// Alignment of vector types. FIXME!
Align = TM->getSubtargetImpl()->getDataLayout()->getTypeAllocSize(Type);
Align = MF->getSubtarget().getDataLayout()->getTypeAllocSize(Type);
}
}
@ -1022,8 +1020,8 @@ EmitSpecialNode(SDNode *Node, bool IsClone, bool IsCloned,
/// at the given position in the given block.
InstrEmitter::InstrEmitter(MachineBasicBlock *mbb,
MachineBasicBlock::iterator insertpos)
: MF(mbb->getParent()), MRI(&MF->getRegInfo()), TM(&MF->getTarget()),
TII(TM->getSubtargetImpl()->getInstrInfo()),
TRI(TM->getSubtargetImpl()->getRegisterInfo()),
TLI(TM->getSubtargetImpl()->getTargetLowering()), MBB(mbb),
: MF(mbb->getParent()), MRI(&MF->getRegInfo()),
TII(MF->getSubtarget().getInstrInfo()),
TRI(MF->getSubtarget().getRegisterInfo()),
TLI(MF->getSubtarget().getTargetLowering()), MBB(mbb),
InsertPos(insertpos) {}

View File

@ -29,7 +29,6 @@ class SDDbgValue;
class InstrEmitter {
MachineFunction *MF;
MachineRegisterInfo *MRI;
const TargetMachine *TM;
const TargetInstrInfo *TII;
const TargetRegisterInfo *TRI;
const TargetLowering *TLI;