MachineInstrInfo doesn't need a TargetMachine

llvm-svn: 4372

lib/Target/Sparc/Sparc.cpp

@@ -126,7 +126,6 @@ UltraSparcFrameInfo::getDynamicAreaOffset(MachineFunction& mcInfo,
 
 UltraSparc::UltraSparc()
   : TargetMachine("UltraSparc-Native"),
-    instrInfo(*this),
     schedInfo(*this),
     regInfo(*this),
     frameInfo(*this),

lib/Target/Sparc/SparcInstrInfo.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)
 {

lib/Target/Sparc/SparcInternals.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

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