Remove the uses of getSubtargetImpl from InstrEmitter and remove
the now unused TargetMachine variable. llvm-svn: 219379
This commit is contained in:
parent
85de8f98a9
commit
147c2ea05a
|
@ -27,7 +27,6 @@
|
||||||
#include "llvm/Support/MathExtras.h"
|
#include "llvm/Support/MathExtras.h"
|
||||||
#include "llvm/Target/TargetInstrInfo.h"
|
#include "llvm/Target/TargetInstrInfo.h"
|
||||||
#include "llvm/Target/TargetLowering.h"
|
#include "llvm/Target/TargetLowering.h"
|
||||||
#include "llvm/Target/TargetMachine.h"
|
|
||||||
#include "llvm/Target/TargetSubtargetInfo.h"
|
#include "llvm/Target/TargetSubtargetInfo.h"
|
||||||
using namespace llvm;
|
using namespace llvm;
|
||||||
|
|
||||||
|
@ -407,11 +406,10 @@ void InstrEmitter::AddOperand(MachineInstrBuilder &MIB,
|
||||||
Type *Type = CP->getType();
|
Type *Type = CP->getType();
|
||||||
// MachineConstantPool wants an explicit alignment.
|
// MachineConstantPool wants an explicit alignment.
|
||||||
if (Align == 0) {
|
if (Align == 0) {
|
||||||
Align =
|
Align = MF->getSubtarget().getDataLayout()->getPrefTypeAlignment(Type);
|
||||||
TM->getSubtargetImpl()->getDataLayout()->getPrefTypeAlignment(Type);
|
|
||||||
if (Align == 0) {
|
if (Align == 0) {
|
||||||
// Alignment of vector types. FIXME!
|
// 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.
|
/// at the given position in the given block.
|
||||||
InstrEmitter::InstrEmitter(MachineBasicBlock *mbb,
|
InstrEmitter::InstrEmitter(MachineBasicBlock *mbb,
|
||||||
MachineBasicBlock::iterator insertpos)
|
MachineBasicBlock::iterator insertpos)
|
||||||
: MF(mbb->getParent()), MRI(&MF->getRegInfo()), TM(&MF->getTarget()),
|
: MF(mbb->getParent()), MRI(&MF->getRegInfo()),
|
||||||
TII(TM->getSubtargetImpl()->getInstrInfo()),
|
TII(MF->getSubtarget().getInstrInfo()),
|
||||||
TRI(TM->getSubtargetImpl()->getRegisterInfo()),
|
TRI(MF->getSubtarget().getRegisterInfo()),
|
||||||
TLI(TM->getSubtargetImpl()->getTargetLowering()), MBB(mbb),
|
TLI(MF->getSubtarget().getTargetLowering()), MBB(mbb),
|
||||||
InsertPos(insertpos) {}
|
InsertPos(insertpos) {}
|
||||||
|
|
|
@ -29,7 +29,6 @@ class SDDbgValue;
|
||||||
class InstrEmitter {
|
class InstrEmitter {
|
||||||
MachineFunction *MF;
|
MachineFunction *MF;
|
||||||
MachineRegisterInfo *MRI;
|
MachineRegisterInfo *MRI;
|
||||||
const TargetMachine *TM;
|
|
||||||
const TargetInstrInfo *TII;
|
const TargetInstrInfo *TII;
|
||||||
const TargetRegisterInfo *TRI;
|
const TargetRegisterInfo *TRI;
|
||||||
const TargetLowering *TLI;
|
const TargetLowering *TLI;
|
||||||
|
|
Loading…
Reference in New Issue