[llvm-commits] CVS: llvm/lib/CodeGen/RegAllocLinearScan.cpp

[Alkis Evlogimenos]

Changes in directory llvm/lib/CodeGen:

RegAllocLinearScan.cpp updated: 1.50 -> 1.51

---
Log message:

Fix RA::verifyAssignment()


---
Diffs of the changes:  (+8 -4)

Index: llvm/lib/CodeGen/RegAllocLinearScan.cpp
diff -u llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.50 llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.51
--- llvm/lib/CodeGen/RegAllocLinearScan.cpp:1.50	Thu Feb 19 00:19:09 2004
+++ llvm/lib/CodeGen/RegAllocLinearScan.cpp	Thu Feb 19 13:24:17 2004
@@ -210,13 +210,17 @@
         void verifyAssignment() const {
             for (Virt2PhysMap::const_iterator i = v2pMap_.begin(),
                      e = v2pMap_.end(); i != e; ++i)
-                for (Virt2PhysMap::const_iterator i2 = i; i2 != e; ++i2)
-                    if (mri_->areAliases(i->second, i2->second)) {
+                for (Virt2PhysMap::const_iterator i2 = next(i); i2 != e; ++i2)
+                    if (MRegisterInfo::isVirtualRegister(i->second) &&
+                        (i->second == i2->second ||
+                         mri_->areAliases(i->second, i2->second))) {
                         const LiveIntervals::Interval
                             &in = li_->getInterval(i->second),
                             &in2 = li_->getInterval(i2->second);
-                        assert(!in.overlaps(in2) &&
-                               "overlapping intervals for same register!");
+                        if (in.overlaps(in2)) {
+                            std::cerr << in << " overlaps " << in2 << '\n';
+                            assert(0);
+                        }
                     }
         }
     };