[llvm] r210289 - Remove duplicate copy of InstrItineraryData from the TargetMachine,

[Eric Christopher]

Author: echristo
Date: Thu Jun  5 16:42:54 2014
New Revision: 210289

URL: http://llvm.org/viewvc/llvm-project?rev=210289&view=rev
Log:
Remove duplicate copy of InstrItineraryData from the TargetMachine,
it's already on the subtarget.

Modified:
    llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
    llvm/trunk/lib/Target/X86/X86TargetMachine.h

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.cpp?rev=210289&r1=210288&r2=210289&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.cpp Thu Jun  5 16:42:54 2014
@@ -78,7 +78,6 @@ X86TargetMachine::X86TargetMachine(const
   : 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),

Modified: llvm/trunk/lib/Target/X86/X86TargetMachine.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86TargetMachine.h?rev=210289&r1=210288&r2=210289&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86TargetMachine.h (original)
+++ llvm/trunk/lib/Target/X86/X86TargetMachine.h Thu Jun  5 16:42:54 2014
@@ -31,7 +31,6 @@ class X86TargetMachine final : public LL
   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.