Revert some changes

Author: s-barannikov

llvm/lib/CodeGen/LiveIntervals.cpp

@@ -182,8 +182,7 @@ void LiveIntervals::print(raw_ostream &OS) const {
   OS << "********** INTERVALS **********\n";
 
   // Dump the regunits.
-  assert(RegUnitRanges.size() == TRI->getNumRegUnits());
-  for (MCRegUnit Unit : TRI->regunits())
+  for (unsigned Unit = 0, UnitE = RegUnitRanges.size(); Unit != UnitE; ++Unit)
     if (LiveRange *LR = RegUnitRanges[Unit])
       OS << printRegUnit(Unit, TRI) << ' ' << *LR << '\n';
 

llvm/lib/CodeGen/LiveRegMatrix.cpp

@@ -75,9 +75,8 @@ void LiveRegMatrix::init(MachineFunction &MF, LiveIntervals &pLIS,
 void LiveRegMatrixWrapperLegacy::releaseMemory() { LRM.releaseMemory(); }
 
 void LiveRegMatrix::releaseMemory() {
-  assert(Matrix.size() == TRI->getNumRegUnits());
-  for (MCRegUnit Unit : TRI->regunits()) {
-    Matrix[Unit].clear();
+  for (unsigned i = 0, e = Matrix.size(); i != e; ++i) {
+    Matrix[i].clear();
     // No need to clear Queries here, since LiveIntervalUnion::Query doesn't
     // have anything important to clear and LiveRegMatrix's runOnFunction()
     // does a std::unique_ptr::reset anyways.

llvm/lib/CodeGen/ReachingDefAnalysis.cpp

@@ -155,12 +155,12 @@ void ReachingDefInfo::enterBasicBlock(MachineBasicBlock *MBB) {
       continue;
 
     // Find the most recent reaching definition from a predecessor.
-    for (MCRegUnit Unit : TRI->regunits())
+    for (unsigned Unit = 0; Unit != NumRegUnits; ++Unit)
       LiveRegs[Unit] = std::max(LiveRegs[Unit], Incoming[Unit]);
   }
 
   // Insert the most recent reaching definition we found.
-  for (MCRegUnit Unit : TRI->regunits())
+  for (unsigned Unit = 0; Unit != NumRegUnits; ++Unit)
     if (LiveRegs[Unit] != ReachingDefDefaultVal)
       MBBReachingDefs.append(MBBNumber, Unit, LiveRegs[Unit]);
 }
@@ -235,7 +235,7 @@ void ReachingDefInfo::reprocessBasicBlock(MachineBasicBlock *MBB) {
     if (Incoming.empty())
       continue;
 
-    for (MCRegUnit Unit : TRI->regunits()) {
+    for (unsigned Unit = 0; Unit != NumRegUnits; ++Unit) {
       int Def = Incoming[Unit];
       if (Def == ReachingDefDefaultVal)
         continue;
@@ -368,7 +368,7 @@ void ReachingDefInfo::traverse() {
   // Make sure reaching defs are sorted and unique.
   for (unsigned MBBNumber = 0, NumBlockIDs = MF->getNumBlockIDs();
        MBBNumber != NumBlockIDs; ++MBBNumber) {
-    for (MCRegUnit Unit : TRI->regunits()) {
+    for (unsigned Unit = 0; Unit != NumRegUnits; ++Unit) {
       int LastDef = ReachingDefDefaultVal;
       for (int Def : MBBReachingDefs.defs(MBBNumber, Unit)) {
         assert(Def > LastDef && "Defs must be sorted and unique");