diff options
author | Eric Christopher <echristo@gmail.com> | 2014-06-11 00:53:17 +0000 |
---|---|---|
committer | Eric Christopher <echristo@gmail.com> | 2014-06-11 00:53:17 +0000 |
commit | f68129838ba5cb09d13ed53092893e0220a9e773 (patch) | |
tree | 345167e2b74d8cf9c79df2116c072ed4f90804c3 /lib/Target/PowerPC | |
parent | e290e4abc3b926297bfbaf69533c680a4bd36b48 (diff) | |
download | llvm-f68129838ba5cb09d13ed53092893e0220a9e773.tar.gz llvm-f68129838ba5cb09d13ed53092893e0220a9e773.tar.bz2 llvm-f68129838ba5cb09d13ed53092893e0220a9e773.tar.xz |
Remove duplicate copy of InstrItineraryData from the TargetMachine,
it's already on the subtarget.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210619 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Target/PowerPC')
-rw-r--r-- | lib/Target/PowerPC/PPCTargetMachine.cpp | 18 | ||||
-rw-r--r-- | lib/Target/PowerPC/PPCTargetMachine.h | 3 |
2 files changed, 8 insertions, 13 deletions
diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp index 2323addd21..2e55a76515 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.cpp +++ b/lib/Target/PowerPC/PPCTargetMachine.cpp @@ -72,18 +72,14 @@ static std::string getDataLayoutString(const PPCSubtarget &ST) { return Ret; } -PPCTargetMachine::PPCTargetMachine(const Target &T, StringRef TT, - StringRef CPU, StringRef FS, - const TargetOptions &Options, +PPCTargetMachine::PPCTargetMachine(const Target &T, StringRef TT, StringRef CPU, + StringRef FS, const TargetOptions &Options, Reloc::Model RM, CodeModel::Model CM, - CodeGenOpt::Level OL, - bool is64Bit) - : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), - Subtarget(TT, CPU, FS, is64Bit, OL), - DL(getDataLayoutString(Subtarget)), InstrInfo(*this), - FrameLowering(Subtarget), JITInfo(*this, is64Bit), - TLInfo(*this), TSInfo(*this), - InstrItins(Subtarget.getInstrItineraryData()) { + CodeGenOpt::Level OL, bool is64Bit) + : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL), + Subtarget(TT, CPU, FS, is64Bit, OL), DL(getDataLayoutString(Subtarget)), + InstrInfo(*this), FrameLowering(Subtarget), JITInfo(*this, is64Bit), + TLInfo(*this), TSInfo(*this) { initAsmInfo(); } diff --git a/lib/Target/PowerPC/PPCTargetMachine.h b/lib/Target/PowerPC/PPCTargetMachine.h index 9e924945d8..7d76ec4dd9 100644 --- a/lib/Target/PowerPC/PPCTargetMachine.h +++ b/lib/Target/PowerPC/PPCTargetMachine.h @@ -35,7 +35,6 @@ class PPCTargetMachine : public LLVMTargetMachine { PPCJITInfo JITInfo; PPCTargetLowering TLInfo; PPCSelectionDAGInfo TSInfo; - InstrItineraryData InstrItins; public: PPCTargetMachine(const Target &T, StringRef TT, @@ -61,7 +60,7 @@ public: const DataLayout *getDataLayout() const override { return &DL; } const PPCSubtarget *getSubtargetImpl() const override { return &Subtarget; } const InstrItineraryData *getInstrItineraryData() const override { - return &InstrItins; + return &getSubtargetImpl()->getInstrItineraryData(); } // Pass Pipeline Configuration |