1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-11-23 19:23:23 +01:00

Remove caching of the target machine in NVPTXInstrInfo and

update constructor accordingly.

llvm-svn: 211840
This commit is contained in:
Eric Christopher 2014-06-27 01:27:08 +00:00
parent 035afbc45f
commit 8010e246be
3 changed files with 4 additions and 5 deletions

View File

@ -29,8 +29,8 @@ using namespace llvm;
void NVPTXInstrInfo::anchor() {} void NVPTXInstrInfo::anchor() {}
// FIXME: Add the subtarget support on this constructor. // FIXME: Add the subtarget support on this constructor.
NVPTXInstrInfo::NVPTXInstrInfo(NVPTXTargetMachine &tm) NVPTXInstrInfo::NVPTXInstrInfo(NVPTXSubtarget &STI)
: NVPTXGenInstrInfo(), TM(tm), RegInfo(*TM.getSubtargetImpl()) {} : NVPTXGenInstrInfo(), RegInfo(STI) {}
void NVPTXInstrInfo::copyPhysReg( void NVPTXInstrInfo::copyPhysReg(
MachineBasicBlock &MBB, MachineBasicBlock::iterator I, DebugLoc DL, MachineBasicBlock &MBB, MachineBasicBlock::iterator I, DebugLoc DL,

View File

@ -24,11 +24,10 @@
namespace llvm { namespace llvm {
class NVPTXInstrInfo : public NVPTXGenInstrInfo { class NVPTXInstrInfo : public NVPTXGenInstrInfo {
NVPTXTargetMachine &TM;
const NVPTXRegisterInfo RegInfo; const NVPTXRegisterInfo RegInfo;
virtual void anchor(); virtual void anchor();
public: public:
explicit NVPTXInstrInfo(NVPTXTargetMachine &TM); explicit NVPTXInstrInfo(NVPTXSubtarget &STI);
const NVPTXRegisterInfo &getRegisterInfo() const { return RegInfo; } const NVPTXRegisterInfo &getRegisterInfo() const { return RegInfo; }

View File

@ -84,7 +84,7 @@ NVPTXTargetMachine::NVPTXTargetMachine(const Target &T, StringRef TT,
CodeGenOpt::Level OL, bool is64bit) CodeGenOpt::Level OL, bool is64bit)
: LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
Subtarget(TT, CPU, FS, is64bit), DL(computeDataLayout(Subtarget)), Subtarget(TT, CPU, FS, is64bit), DL(computeDataLayout(Subtarget)),
InstrInfo(*this), TLInfo(*this), TSInfo(&DL), InstrInfo(Subtarget), TLInfo(*this), TSInfo(&DL),
FrameLowering(*this, is64bit) { FrameLowering(*this, is64bit) {
initAsmInfo(); initAsmInfo();
} }