Fix for MCRegUnit

Author: michaelselehov

llvm/lib/CodeGen/LiveRegMatrix.cpp

@@ -321,11 +321,12 @@ bool LiveRegMatrix::isValid() const {
   // Now scan all LiveIntervalUnions in the matrix and verify each pointer
   unsigned NumDanglingPointers = 0;
   for (unsigned Unit = 0, NumUnits = Matrix.size(); Unit != NumUnits; ++Unit) {
-    for (const LiveInterval *LI : Matrix[Unit]) {
+    MCRegUnit RegUnit = static_cast<MCRegUnit>(Unit);
+    for (const LiveInterval *LI : Matrix[RegUnit]) {
       if (!ValidIntervals.contains(LI)) {
         ++NumDanglingPointers;
         dbgs() << "ERROR: LiveInterval pointer is not found in LiveIntervals:\n"
-               << "  Register Unit: " << printRegUnit(Unit, TRI) << "\n"
+               << "  Register Unit: " << printRegUnit(RegUnit, TRI) << "\n"
                << "  LiveInterval pointer: " << LI << "\n";
       }
     }

llvm/lib/Target/AMDGPU/AMDGPUHotBlockRegisterRenaming.cpp

@@ -348,7 +348,8 @@ void AMDGPUHotBlockRegisterRenamingImpl::calculateValueDensity(
 
     // Access LiveIntervalUnion for this PhysReg
     for (MCRegUnit Unit : TRI->regunits(PhysReg)) {
-      LiveIntervalUnion &LIU = LRM->getLiveUnions()[Unit];
+      LiveIntervalUnion &LIU =
+          LRM->getLiveUnions()[static_cast<unsigned>(Unit)];
 
       for (LiveIntervalUnion::SegmentIter SI = LIU.begin(); SI.valid(); ++SI) {
         SlotIndex SegStart = SI.start();
@@ -389,7 +390,8 @@ void AMDGPUHotBlockRegisterRenamingImpl::findFreeRegisters(
 
     // Check all register units
     for (MCRegUnit Unit : TRI->regunits(PhysReg)) {
-      LiveIntervalUnion &LIU = LRM->getLiveUnions()[Unit];
+      LiveIntervalUnion &LIU =
+          LRM->getLiveUnions()[static_cast<unsigned>(Unit)];
 
       // Check if anything is live in this BB
       LiveIntervalUnion::SegmentIter SI = LIU.find(BBStart);
@@ -498,7 +500,7 @@ bool AMDGPUHotBlockRegisterRenamingImpl::tryMoveValue(
     const DenseMap<MCRegister, SmallVector<SlotIndex, 4>> &PhysRegDefs) {
   // Find a movable local value in DenseReg
   for (MCRegUnit Unit : TRI->regunits(DenseReg)) {
-    LiveIntervalUnion &LIU = LRM->getLiveUnions()[Unit];
+    LiveIntervalUnion &LIU = LRM->getLiveUnions()[static_cast<unsigned>(Unit)];
 
     for (LiveIntervalUnion::SegmentIter SI = LIU.begin(); SI.valid(); ++SI) {
       Register VirtReg = SI.value()->reg();