2 files changed, 9 insertions, 11 deletions
diff --git a/lib/CodeGen/RegAlloc/LiveRangeInfo.h b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
index 09aca44f30..48e81c1068 100644
--- a/lib/CodeGen/RegAlloc/LiveRangeInfo.h
+++ b/lib/CodeGen/RegAlloc/LiveRangeInfo.h
@@ -20,10 +20,10 @@
 #define LIVE_RANGE_INFO_H
 
 #include "Support/HashExtras.h"
+#include "llvm/Analysis/LiveVar/ValueSet.h"
 
 class LiveRange;
 class MachineInstr;
-class LiveVarSet;
 class RegClass;
 class MachineRegInfo;
 class TargetMachine;
@@ -60,17 +60,15 @@ class LiveRangeInfo {
 
   void unionAndUpdateLRs(LiveRange *L1, LiveRange *L2);
 
-  void addInterference(const Instruction *const Inst, 
-		       const LiveVarSet *const LVSet);
+  void addInterference(const Instruction *Inst, const ValueSet *LVSet);
   
   void suggestRegs4CallRets();
 
   const Method* getMethod() { return Meth; }
 
-
 public:
   
-  LiveRangeInfo(const Method *const M, 
+  LiveRangeInfo(const Method *M, 
 		const TargetMachine& tm,
 		std::vector<RegClass *> & RCList);
 
diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.h b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
index de8d793838..f3aef1cdc2 100644
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.h
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
@@ -98,15 +98,15 @@ private:
 
   //------- ------------------ private methods---------------------------------
 
-  void addInterference(const Value *const Def, const LiveVarSet *const LVSet, 
-		       const bool isCallInst);
+  void addInterference(const Value *Def, const ValueSet *LVSet, 
+		       bool isCallInst);
 
   void addInterferencesForArgs();
   void createIGNodeListsAndIGs();
   void buildInterferenceGraphs();
 
   void setCallInterferences(const MachineInstr *MInst, 
-			    const LiveVarSet *const LVSetAft );
+			    const ValueSet *LVSetAft );
 
   void move2DelayedInstr(const MachineInstr *OrigMI, 
 			 const MachineInstr *DelayedMI );
@@ -131,13 +131,13 @@ private:
   friend class UltraSparcRegInfo;
 
 
-  int getUsableUniRegAtMI(RegClass *RC,  const int RegType, 
+  int getUsableUniRegAtMI(RegClass *RC, int RegType, 
 			  const MachineInstr *MInst,
-			  const LiveVarSet *LVSetBef, MachineInstr *MIBef, 
+			  const ValueSet *LVSetBef, MachineInstr *MIBef, 
 			  MachineInstr *MIAft );
 
   int getUnusedUniRegAtMI(RegClass *RC,  const MachineInstr *MInst, 
-		       const LiveVarSet *LVSetBef);
+		       const ValueSet *LVSetBef);
 
   void setRelRegsUsedByThisInst(RegClass *RC, const MachineInstr *MInst );
   int getUniRegNotUsedByThisInst(RegClass *RC, const MachineInstr *MInst);