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@210289 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/X86/X86TargetMachine.cpp b/lib/Target/X86/X86TargetMachine.cpp
index 7d91d14f47c01892df4f04f4ad7e02e467a40de8..b2e4acb338f23df414ecc6c935b3ecb617a412c2 100644 (file)
--- a/lib/Target/X86/X86TargetMachine.cpp
+++ b/lib/Target/X86/X86TargetMachine.cpp
@@ -78,7 +78,6 @@ X86TargetMachine::X86TargetMachine(const Target &T, StringRef TT,
   : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
     Subtarget(TT, CPU, FS, Options.StackAlignmentOverride),
     FrameLowering(Subtarget),
-    InstrItins(Subtarget.getInstrItineraryData()),
     DL(computeDataLayout(*getSubtargetImpl())),
     InstrInfo(*this),
     TLInfo(*this),

diff --git a/lib/Target/X86/X86TargetMachine.h b/lib/Target/X86/X86TargetMachine.h
index 57e6eda6bc156518231b36ea2e0a74d5f73d8c8c..1a1056b98cd580fc7f0374200a4e15402ebe933d 100644 (file)
--- a/lib/Target/X86/X86TargetMachine.h
+++ b/lib/Target/X86/X86TargetMachine.h
@@ -31,7 +31,6 @@ class X86TargetMachine final : public LLVMTargetMachine {
   virtual void anchor();
   X86Subtarget       Subtarget;
   X86FrameLowering   FrameLowering;
-  InstrItineraryData InstrItins;
   const DataLayout   DL; // Calculates type size & alignment
   X86InstrInfo       InstrInfo;
   X86TargetLowering  TLInfo;
@@ -65,7 +64,7 @@ public:
     return &getInstrInfo()->getRegisterInfo();
   }
   const InstrItineraryData *getInstrItineraryData() const override {
-    return &InstrItins;
+    return &getSubtargetImpl()->getInstrItineraryData();
   }
 
   /// \brief Register X86 analysis passes with a pass manager.