diff --git a/lib/CodeGen/RegAlloc/LiveRange.h b/lib/CodeGen/RegAlloc/LiveRange.h
index 5b7b7ca2d49..3ef627ed985 100644
--- a/lib/CodeGen/RegAlloc/LiveRange.h
+++ b/lib/CodeGen/RegAlloc/LiveRange.h
@@ -109,7 +109,7 @@ class LiveRange : public ValueSet
 
 
 
-  inline bool hasSpillOffset() {
+  inline bool hasSpillOffset() const {
     return  HasSpillOffset;
   }
 
diff --git a/lib/CodeGen/RegAlloc/PhyRegAlloc.h b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
index 060600147e0..f76e68bb96c 100644
--- a/lib/CodeGen/RegAlloc/PhyRegAlloc.h
+++ b/lib/CodeGen/RegAlloc/PhyRegAlloc.h
@@ -128,15 +128,16 @@ class PhyRegAlloc: public NonCopyable
   friend class UltraSparcRegInfo;
 
 
-  int getUsableRegAtMI(RegClass *RC,  const int RegType, const MachineInstr *MInst,
-		       const LiveVarSet *LVSetBef, MachineInstr *MIBef, 
-		       MachineInstr *MIAft );
+  int getUsableUniRegAtMI(RegClass *RC,  const int RegType, 
+			  const MachineInstr *MInst,
+			  const LiveVarSet *LVSetBef, MachineInstr *MIBef, 
+			  MachineInstr *MIAft );
 
-  int getUnusedRegAtMI(RegClass *RC,  const MachineInstr *MInst, 
+  int getUnusedUniRegAtMI(RegClass *RC,  const MachineInstr *MInst, 
 		       const LiveVarSet *LVSetBef);
 
-  void setRegsUsedByThisInst(RegClass *RC, const MachineInstr *MInst );
-  int getRegNotUsedByThisInst(RegClass *RC, const MachineInstr *MInst);
+  void setRelRegsUsedByThisInst(RegClass *RC, const MachineInstr *MInst );
+  int getUniRegNotUsedByThisInst(RegClass *RC, const MachineInstr *MInst);
 
   void addInterf4PseudoInstr(const MachineInstr *MInst);
 
diff --git a/lib/Target/SparcV9/RegAlloc/LiveRange.h b/lib/Target/SparcV9/RegAlloc/LiveRange.h
index 5b7b7ca2d49..3ef627ed985 100644
--- a/lib/Target/SparcV9/RegAlloc/LiveRange.h
+++ b/lib/Target/SparcV9/RegAlloc/LiveRange.h
@@ -109,7 +109,7 @@ class LiveRange : public ValueSet
 
 
 
-  inline bool hasSpillOffset() {
+  inline bool hasSpillOffset() const {
     return  HasSpillOffset;
   }
 
diff --git a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
index 060600147e0..f76e68bb96c 100644
--- a/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
+++ b/lib/Target/SparcV9/RegAlloc/PhyRegAlloc.h
@@ -128,15 +128,16 @@ class PhyRegAlloc: public NonCopyable
   friend class UltraSparcRegInfo;
 
 
-  int getUsableRegAtMI(RegClass *RC,  const int RegType, const MachineInstr *MInst,
-		       const LiveVarSet *LVSetBef, MachineInstr *MIBef, 
-		       MachineInstr *MIAft );
+  int getUsableUniRegAtMI(RegClass *RC,  const int RegType, 
+			  const MachineInstr *MInst,
+			  const LiveVarSet *LVSetBef, MachineInstr *MIBef, 
+			  MachineInstr *MIAft );
 
-  int getUnusedRegAtMI(RegClass *RC,  const MachineInstr *MInst, 
+  int getUnusedUniRegAtMI(RegClass *RC,  const MachineInstr *MInst, 
 		       const LiveVarSet *LVSetBef);
 
-  void setRegsUsedByThisInst(RegClass *RC, const MachineInstr *MInst );
-  int getRegNotUsedByThisInst(RegClass *RC, const MachineInstr *MInst);
+  void setRelRegsUsedByThisInst(RegClass *RC, const MachineInstr *MInst );
+  int getUniRegNotUsedByThisInst(RegClass *RC, const MachineInstr *MInst);
 
   void addInterf4PseudoInstr(const MachineInstr *MInst);