[llvm] r229168 - Move the target machine variable so that it's initialized early

[Eric Christopher]

Author: echristo
Date: Fri Feb 13 16:48:51 2015
New Revision: 229168

URL: http://llvm.org/viewvc/llvm-project?rev=229168&view=rev
Log:
Move the target machine variable so that it's initialized early
enough we can use it to initialize frame lowering.

Modified:
    llvm/trunk/lib/Target/PowerPC/PPCSubtarget.cpp
    llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h

Modified: llvm/trunk/lib/Target/PowerPC/PPCSubtarget.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCSubtarget.cpp?rev=229168&r1=229167&r2=229168&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCSubtarget.cpp (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCSubtarget.cpp Fri Feb 13 16:48:51 2015
@@ -49,9 +49,9 @@ PPCSubtarget::PPCSubtarget(const std::st
     : PPCGenSubtargetInfo(TT, CPU, FS), TargetTriple(TT),
       IsPPC64(TargetTriple.getArch() == Triple::ppc64 ||
               TargetTriple.getArch() == Triple::ppc64le),
-      TargetABI(PPC_ABI_UNKNOWN),
+      TargetABI(PPC_ABI_UNKNOWN), TM(TM),
       FrameLowering(initializeSubtargetDependencies(CPU, FS)), InstrInfo(*this),
-      TLInfo(TM, *this), TSInfo(TM.getDataLayout()), TM(TM) {}
+      TLInfo(TM, *this), TSInfo(TM.getDataLayout()) {}
 
 void PPCSubtarget::initializeEnvironment() {
   StackAlignment = 16;

Modified: llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h?rev=229168&r1=229167&r2=229168&view=diff
==============================================================================
--- llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h (original)
+++ llvm/trunk/lib/Target/PowerPC/PPCSubtarget.h Fri Feb 13 16:48:51 2015
@@ -119,12 +119,11 @@ protected:
     PPC_ABI_ELFv1,
     PPC_ABI_ELFv2
   } TargetABI;
-
+  const PPCTargetMachine &TM;
   PPCFrameLowering FrameLowering;
   PPCInstrInfo InstrInfo;
   PPCTargetLowering TLInfo;
   PPCSelectionDAGInfo TSInfo;
-  const PPCTargetMachine &TM;
 
 public:
   /// This constructor initializes the data members to match that