Move the PPCSelectionDAGInfo off the TargetMachine and onto the

subtarget.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@210854 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Target/PowerPC/PPCSubtarget.cpp b/lib/Target/PowerPC/PPCSubtarget.cpp
index cee54bd9910b358c284a00592e6760cec197acc5..0759200ce3530ac5af2295f27b8362e6773d4b26 100644 (file)
--- a/lib/Target/PowerPC/PPCSubtarget.cpp
+++ b/lib/Target/PowerPC/PPCSubtarget.cpp
@@ -81,7 +81,7 @@ PPCSubtarget::PPCSubtarget(const std::string &TT, const std::string &CPU,
       OptLevel(OptLevel),
       FrameLowering(initializeSubtargetDependencies(CPU, FS)),
       DL(getDataLayoutString(*this)), InstrInfo(*this), JITInfo(*this),
       OptLevel(OptLevel),
       FrameLowering(initializeSubtargetDependencies(CPU, FS)),
       DL(getDataLayoutString(*this)), InstrInfo(*this), JITInfo(*this),

-      TLInfo(TM) {}
+      TLInfo(TM), TSInfo(&DL) {}

 
 /// SetJITMode - This is called to inform the subtarget info that we are
 /// producing code for the JIT.
 
 /// SetJITMode - This is called to inform the subtarget info that we are
 /// producing code for the JIT.

diff --git a/lib/Target/PowerPC/PPCSubtarget.h b/lib/Target/PowerPC/PPCSubtarget.h
index 91d1746a8d06d862565f280614f542bf9e2a8bbf..3436095a22b7f4748762731cc6514a6894747072 100644 (file)
--- a/lib/Target/PowerPC/PPCSubtarget.h
+++ b/lib/Target/PowerPC/PPCSubtarget.h
@@ -18,6 +18,7 @@
 #include "PPCInstrInfo.h"
 #include "PPCISelLowering.h"
 #include "PPCJITInfo.h"
 #include "PPCInstrInfo.h"
 #include "PPCISelLowering.h"
 #include "PPCJITInfo.h"

+#include "PPCSelectionDAGInfo.h"

 #include "llvm/ADT/Triple.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/MC/MCInstrItineraries.h"
 #include "llvm/ADT/Triple.h"
 #include "llvm/IR/DataLayout.h"
 #include "llvm/MC/MCInstrItineraries.h"


@@ -112,6 +113,7 @@ protected:
   PPCInstrInfo InstrInfo;
   PPCJITInfo JITInfo;
   PPCTargetLowering TLInfo;
   PPCInstrInfo InstrInfo;
   PPCJITInfo JITInfo;
   PPCTargetLowering TLInfo;

+  PPCSelectionDAGInfo TSInfo;

 
 public:
   /// This constructor initializes the data members to match that
 
 public:
   /// This constructor initializes the data members to match that


@@ -147,6 +149,7 @@ public:
   const PPCInstrInfo *getInstrInfo() const { return &InstrInfo; }
   PPCJITInfo *getJITInfo() { return &JITInfo; }
   const PPCTargetLowering *getTargetLowering() const { return &TLInfo; }
   const PPCInstrInfo *getInstrInfo() const { return &InstrInfo; }
   PPCJITInfo *getJITInfo() { return &JITInfo; }
   const PPCTargetLowering *getTargetLowering() const { return &TLInfo; }

+  const PPCSelectionDAGInfo *getSelectionDAGInfo() const { return &TSInfo; }

 
   /// initializeSubtargetDependencies - Initializes using a CPU and feature string
   /// so that we can use initializer lists for subtarget initialization.
 
   /// initializeSubtargetDependencies - Initializes using a CPU and feature string
   /// so that we can use initializer lists for subtarget initialization.

diff --git a/lib/Target/PowerPC/PPCTargetMachine.cpp b/lib/Target/PowerPC/PPCTargetMachine.cpp
index dc23e958941496558ba0cda585af15524c4fb6e8..9563b9045c3926e2dd7d48ac4eee550ebd73be3c 100644 (file)
--- a/lib/Target/PowerPC/PPCTargetMachine.cpp
+++ b/lib/Target/PowerPC/PPCTargetMachine.cpp
@@ -42,8 +42,7 @@ PPCTargetMachine::PPCTargetMachine(const Target &T, StringRef TT, StringRef CPU,
                                    Reloc::Model RM, CodeModel::Model CM,
                                    CodeGenOpt::Level OL, bool is64Bit)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),
                                    Reloc::Model RM, CodeModel::Model CM,
                                    CodeGenOpt::Level OL, bool is64Bit)
     : LLVMTargetMachine(T, TT, CPU, FS, Options, RM, CM, OL),

-      Subtarget(TT, CPU, FS, *this, is64Bit, OL),
-      TSInfo(Subtarget.getDataLayout()) {
+      Subtarget(TT, CPU, FS, *this, is64Bit, OL) {

   initAsmInfo();
 }
 
   initAsmInfo();
 }
 

diff --git a/lib/Target/PowerPC/PPCTargetMachine.h b/lib/Target/PowerPC/PPCTargetMachine.h
index 705874c473d29413eea97b0b2b951d6cd112feaf..3cf8063b70ef6c99f7bd717553fd4450c108ab73 100644 (file)
--- a/lib/Target/PowerPC/PPCTargetMachine.h
+++ b/lib/Target/PowerPC/PPCTargetMachine.h
@@ -29,7 +29,6 @@ namespace llvm {
 ///
 class PPCTargetMachine : public LLVMTargetMachine {
   PPCSubtarget        Subtarget;
 ///
 class PPCTargetMachine : public LLVMTargetMachine {
   PPCSubtarget        Subtarget;

-  PPCSelectionDAGInfo TSInfo;

 
 public:
   PPCTargetMachine(const Target &T, StringRef TT,
 
 public:
   PPCTargetMachine(const Target &T, StringRef TT,


@@ -48,7 +47,7 @@ public:
     return getSubtargetImpl()->getTargetLowering();
   }
   const PPCSelectionDAGInfo* getSelectionDAGInfo() const override {
     return getSubtargetImpl()->getTargetLowering();
   }
   const PPCSelectionDAGInfo* getSelectionDAGInfo() const override {

-    return &TSInfo;
+    return getSubtargetImpl()->getSelectionDAGInfo();

   }
   const PPCRegisterInfo *getRegisterInfo() const override {
     return &getInstrInfo()->getRegisterInfo();
   }
   const PPCRegisterInfo *getRegisterInfo() const override {
     return &getInstrInfo()->getRegisterInfo();