1 files changed, 7 insertions, 6 deletions
diff --git a/lib/CodeGen/RegAllocLinearScan.cpp b/lib/CodeGen/RegAllocLinearScan.cpp
index abd1390093..8712e98d85 100644
--- a/lib/CodeGen/RegAllocLinearScan.cpp
+++ b/lib/CodeGen/RegAllocLinearScan.cpp
@@ -161,21 +161,22 @@ namespace {
             }
             std::cerr << '\n';
         }
+
         void printIntervals(const char* const str,
                             RA::IntervalPtrs::const_iterator i,
                             RA::IntervalPtrs::const_iterator e) const {
             if (str) std::cerr << str << " intervals:\n";
             for (; i != e; ++i) {
                 std::cerr << "\t\t" << **i << " -> ";
-                if ((*i)->reg < MRegisterInfo::FirstVirtualRegister) {
-                    std::cerr << mri_->getName((*i)->reg);
-                }
-                else {
-                    std::cerr << mri_->getName(v2pMap_.find((*i)->reg)->second);
+                unsigned reg = (*i)->reg;
+                if (reg >= MRegisterInfo::FirstVirtualRegister) {
+                    Virt2PhysMap::const_iterator it = v2pMap_.find(reg);
+                    reg = (it == v2pMap_.end() ? 0 : it->second);
                 }
-                std::cerr << '\n';
+                std::cerr << mri_->getName((*i)->reg) << '\n';
             }
         }
+
         void printFreeRegs(const char* const str,
                            const TargetRegisterClass* rc) const {
             if (str) std::cerr << str << ':';