diff options
author | Eric Christopher <echristo@gmail.com> | 2014-06-13 23:11:13 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2014-06-13 23:11:13 +0000 |
commit | 53551e2476b6ef291fd256a24b1f144587e1e073 (patch) | |
tree | 7cba2165c659c8b4ac3f6a5e5ea711ffb281c490 /lib/Target/ARM | |
parent | 58c99da4d89b0f6b5be6066d2888b0ddc41c8a7c (diff) | |
download | llvm-53551e2476b6ef291fd256a24b1f144587e1e073.tar.gz llvm-53551e2476b6ef291fd256a24b1f144587e1e073.tar.bz2 llvm-53551e2476b6ef291fd256a24b1f144587e1e073.tar.xz |
Remove InstrItineraryData off of the TargetMachine - it's already
on the subtarget and just forward the accessor.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210955 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/ARM')
-rw-r--r-- | lib/Target/ARM/ARMTargetMachine.cpp | 3 | ||||
-rw-r--r-- | lib/Target/ARM/ARMTargetMachine.h | 5 |
2 files changed, 2 insertions, 6 deletions
diff --git a/lib/Target/ARM/ARMTargetMachine.cpp b/lib/Target/ARM/ARMTargetMachine.cpp index 79313fa7ad..e55adfa037 100644 --- a/lib/Target/ARM/ARMTargetMachine.cpp +++ b/lib/Target/ARM/ARMTargetMachine.cpp @@ -52,8 +52,7 @@ ARMBaseTargetMachine::ARMBaseTargetMachine(const Target &T, StringRef TT, CodeGenOpt::Level OL, bool isLittle) : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), - Subtarget(TT, CPU, FS, isLittle, Options), - InstrItins(Subtarget.getInstrItineraryData()) { + Subtarget(TT, CPU, FS, isLittle, Options) { // Default to triple-appropriate float ABI if (Options.FloatABIType == FloatABI::Default) diff --git a/lib/Target/ARM/ARMTargetMachine.h b/lib/Target/ARM/ARMTargetMachine.h index 986789be8d..4100d2e026 100644 --- a/lib/Target/ARM/ARMTargetMachine.h +++ b/lib/Target/ARM/ARMTargetMachine.h @@ -32,9 +32,6 @@ namespace llvm { class ARMBaseTargetMachine : public LLVMTargetMachine { protected: ARMSubtarget Subtarget; -private: - InstrItineraryData InstrItins; - public: ARMBaseTargetMachine(const Target &T, StringRef TT, StringRef CPU, StringRef FS, @@ -49,7 +46,7 @@ public: llvm_unreachable("getTargetLowering not implemented"); } const InstrItineraryData *getInstrItineraryData() const override { - return &InstrItins; + return &getSubtargetImpl()->getInstrItineraryData(); } /// \brief Register ARM analysis passes with a pass manager. |