diff options
| -rw-r--r-- | llvm/lib/Target/ARM/ARMInstructionSelector.cpp | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/ARMInstructionSelector.h | 5 | ||||
| -rw-r--r-- | llvm/lib/Target/ARM/ARMTargetMachine.cpp | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/llvm/lib/Target/ARM/ARMInstructionSelector.cpp b/llvm/lib/Target/ARM/ARMInstructionSelector.cpp index 5905963bcb3..69b94b6b1f4 100644 --- a/llvm/lib/Target/ARM/ARMInstructionSelector.cpp +++ b/llvm/lib/Target/ARM/ARMInstructionSelector.cpp @@ -25,10 +25,9 @@ using namespace llvm; #error "You shouldn't build this" #endif -ARMInstructionSelector::ARMInstructionSelector(const ARMBaseTargetMachine &TM, - const ARMSubtarget &STI, +ARMInstructionSelector::ARMInstructionSelector(const ARMSubtarget &STI, const ARMRegisterBankInfo &RBI) - : InstructionSelector(), TM(TM), STI(STI), TII(*STI.getInstrInfo()), + : InstructionSelector(), TII(*STI.getInstrInfo()), TRI(*STI.getRegisterInfo()), RBI(RBI) {} bool ARMInstructionSelector::select(llvm::MachineInstr &I) const { diff --git a/llvm/lib/Target/ARM/ARMInstructionSelector.h b/llvm/lib/Target/ARM/ARMInstructionSelector.h index 3b32ce4746d..5072cdd60ce 100644 --- a/llvm/lib/Target/ARM/ARMInstructionSelector.h +++ b/llvm/lib/Target/ARM/ARMInstructionSelector.h @@ -24,15 +24,12 @@ class ARMSubtarget; class ARMInstructionSelector : public InstructionSelector { public: - ARMInstructionSelector(const ARMBaseTargetMachine &TM, - const ARMSubtarget &STI, + ARMInstructionSelector(const ARMSubtarget &STI, const ARMRegisterBankInfo &RBI); virtual bool select(MachineInstr &I) const override; private: - const ARMBaseTargetMachine &TM; - const ARMSubtarget &STI; const ARMBaseInstrInfo &TII; const ARMBaseRegisterInfo &TRI; const ARMRegisterBankInfo &RBI; diff --git a/llvm/lib/Target/ARM/ARMTargetMachine.cpp b/llvm/lib/Target/ARM/ARMTargetMachine.cpp index d7d7a0e8d48..7c24c2a3dfd 100644 --- a/llvm/lib/Target/ARM/ARMTargetMachine.cpp +++ b/llvm/lib/Target/ARM/ARMTargetMachine.cpp @@ -307,7 +307,7 @@ ARMBaseTargetMachine::getSubtargetImpl(const Function &F) const { // FIXME: At this point, we can't rely on Subtarget having RBI. // It's awkward to mix passing RBI and the Subtarget; should we pass // TII/TRI as well? - GISel->InstSelector.reset(new ARMInstructionSelector(*this, *I, *RBI)); + GISel->InstSelector.reset(new ARMInstructionSelector(*I, *RBI)); GISel->RegBankInfo.reset(RBI); #endif |
