MachineInstrInfo doesn't need a TargetMachine

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

diff --git a/lib/Target/SparcV9/SparcV9InstrInfo.cpp b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
index fbabe933166403fd398b74121e04629c2c729d93..134bdacae07ce6faf68a3ad4dbb2c5605cfb0651 100644 (file)
--- a/lib/Target/SparcV9/SparcV9InstrInfo.cpp
+++ b/lib/Target/SparcV9/SparcV9InstrInfo.cpp
@@ -324,8 +324,8 @@ InitializeMaxConstantsTable()
 //---------------------------------------------------------------------------
 
 /*ctor*/
-UltraSparcInstrInfo::UltraSparcInstrInfo(const TargetMachine& tgt)
-  : MachineInstrInfo(tgt, SparcMachineInstrDesc,
+UltraSparcInstrInfo::UltraSparcInstrInfo()
+  : MachineInstrInfo(SparcMachineInstrDesc,
                     /*descSize = */ NUM_TOTAL_OPCODES,
                     /*numRealOpCodes = */ NUM_REAL_OPCODES)
 {

diff --git a/lib/Target/SparcV9/SparcV9Internals.h b/lib/Target/SparcV9/SparcV9Internals.h
index 6f283001c9b9fadea24204d2e474aeee7e4117f8..9be6b7fe582dac27663e4653032da94536a4df07 100644 (file)
--- a/lib/Target/SparcV9/SparcV9Internals.h
+++ b/lib/Target/SparcV9/SparcV9Internals.h
@@ -76,7 +76,7 @@ extern const MachineInstrDescriptor SparcMachineInstrDesc[];
 //---------------------------------------------------------------------------
 
 struct UltraSparcInstrInfo : public MachineInstrInfo {
-  UltraSparcInstrInfo(const TargetMachine& tgt);
+  UltraSparcInstrInfo();
 
   //
   // All immediate constants are in position 1 except the

diff --git a/lib/Target/SparcV9/SparcV9TargetMachine.cpp b/lib/Target/SparcV9/SparcV9TargetMachine.cpp
index 42ffd433f0268d6891df1f75da32b72cf1a49679..f04fcf5285ffdfcc6a54539899f3d33b4d97d4fd 100644 (file)
--- a/lib/Target/SparcV9/SparcV9TargetMachine.cpp
+++ b/lib/Target/SparcV9/SparcV9TargetMachine.cpp
@@ -126,7 +126,6 @@ UltraSparcFrameInfo::getDynamicAreaOffset(MachineFunction& mcInfo,
 
 UltraSparc::UltraSparc()
   : TargetMachine("UltraSparc-Native"),
-    instrInfo(*this),
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),

diff --git a/lib/Target/TargetInstrInfo.cpp b/lib/Target/TargetInstrInfo.cpp
index ca26718708e1fa08ddb4e418b767de637ba13d17..a911116f7bcf673318a6e73fba714c482b311b6f 100644 (file)
--- a/lib/Target/TargetInstrInfo.cpp
+++ b/lib/Target/TargetInstrInfo.cpp
@@ -15,11 +15,10 @@
 //---------------------------------------------------------------------------
 
 
-MachineInstrInfo::MachineInstrInfo(const TargetMachine& tgt,
-                                   const MachineInstrDescriptor* Desc,
+MachineInstrInfo::MachineInstrInfo(const MachineInstrDescriptor* Desc,
                                   unsigned DescSize,
                                   unsigned NumRealOpCodes)
-  : target(tgt), desc(Desc), descSize(DescSize), numRealOpCodes(NumRealOpCodes) {
+  : desc(Desc), descSize(DescSize), numRealOpCodes(NumRealOpCodes) {
   // FIXME: TargetInstrDescriptors should not be global
   assert(TargetInstrDescriptors == NULL && desc != NULL);
   TargetInstrDescriptors = desc;       // initialize global variable