Access the subtarget off of the MachineFunction rather than

through the TargetMachine.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@219661 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Eric Christopher
2014-10-14 06:26:53 +00:00
parent db9fed93fa
commit 3788687f31
2 changed files with 2 additions and 5 deletions

View File

@@ -50,7 +50,6 @@ namespace llvm {
class LiveIntervals : public MachineFunctionPass { class LiveIntervals : public MachineFunctionPass {
MachineFunction* MF; MachineFunction* MF;
MachineRegisterInfo* MRI; MachineRegisterInfo* MRI;
const TargetMachine* TM;
const TargetRegisterInfo* TRI; const TargetRegisterInfo* TRI;
const TargetInstrInfo* TII; const TargetInstrInfo* TII;
AliasAnalysis *AA; AliasAnalysis *AA;

View File

@@ -34,7 +34,6 @@
#include "llvm/Support/ErrorHandling.h" #include "llvm/Support/ErrorHandling.h"
#include "llvm/Support/raw_ostream.h" #include "llvm/Support/raw_ostream.h"
#include "llvm/Target/TargetInstrInfo.h" #include "llvm/Target/TargetInstrInfo.h"
#include "llvm/Target/TargetMachine.h"
#include "llvm/Target/TargetRegisterInfo.h" #include "llvm/Target/TargetRegisterInfo.h"
#include "llvm/Target/TargetSubtargetInfo.h" #include "llvm/Target/TargetSubtargetInfo.h"
#include <algorithm> #include <algorithm>
@@ -111,9 +110,8 @@ void LiveIntervals::releaseMemory() {
bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) { bool LiveIntervals::runOnMachineFunction(MachineFunction &fn) {
MF = &fn; MF = &fn;
MRI = &MF->getRegInfo(); MRI = &MF->getRegInfo();
TM = &fn.getTarget(); TRI = MF->getSubtarget().getRegisterInfo();
TRI = TM->getSubtargetImpl()->getRegisterInfo(); TII = MF->getSubtarget().getInstrInfo();
TII = TM->getSubtargetImpl()->getInstrInfo();
AA = &getAnalysis<AliasAnalysis>(); AA = &getAnalysis<AliasAnalysis>();
Indexes = &getAnalysis<SlotIndexes>(); Indexes = &getAnalysis<SlotIndexes>();
DomTree = &getAnalysis<MachineDominatorTree>(); DomTree = &getAnalysis<MachineDominatorTree>();