From 788fa17af87dba8836fca691c9028c57ef8fc4fe Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Fri, 30 Oct 2009 18:12:09 +0000 Subject: [PATCH] Stop the iterator in ValueLiveAt from potentially running off the end of the interval. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@85599 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SimpleRegisterCoalescing.cpp | 8 +++++--- lib/CodeGen/SimpleRegisterCoalescing.h | 3 ++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/SimpleRegisterCoalescing.cpp b/lib/CodeGen/SimpleRegisterCoalescing.cpp index 430df54081e..2aa63075024 100644 --- a/lib/CodeGen/SimpleRegisterCoalescing.cpp +++ b/lib/CodeGen/SimpleRegisterCoalescing.cpp @@ -1866,8 +1866,10 @@ bool SimpleRegisterCoalescing::RangeIsDefinedByCopyFromReg(LiveInterval &li, /// iterator, or any subsequent range with the same value number, /// is live at the given point. bool SimpleRegisterCoalescing::ValueLiveAt(LiveInterval::iterator LRItr, + LiveInterval::iterator LREnd, LiveIndex defPoint) const { - for (const VNInfo *valno = LRItr->valno; LRItr->valno == valno; ++LRItr) { + for (const VNInfo *valno = LRItr->valno; + (LRItr != LREnd) && (LRItr->valno == valno); ++LRItr) { if (LRItr->contains(defPoint)) return true; } @@ -1922,7 +1924,7 @@ bool SimpleRegisterCoalescing::SimpleJoin(LiveInterval &LHS, LiveInterval &RHS){ if (!RangeIsDefinedByCopyFromReg(LHS, LHSIt, RHS.reg)) return false; // Nope, bail out. - if (ValueLiveAt(LHSIt, RHSIt->valno->def)) + if (ValueLiveAt(LHSIt, LHS.end(), RHSIt->valno->def)) // Here is an interesting situation: // BB1: // vr1025 = copy vr1024 @@ -1960,7 +1962,7 @@ bool SimpleRegisterCoalescing::SimpleJoin(LiveInterval &LHS, LiveInterval &RHS){ // Otherwise, if this is a copy from the RHS, mark it as being merged // in. if (RangeIsDefinedByCopyFromReg(LHS, LHSIt, RHS.reg)) { - if (ValueLiveAt(LHSIt, RHSIt->valno->def)) + if (ValueLiveAt(LHSIt, LHS.end(), RHSIt->valno->def)) // Here is an interesting situation: // BB1: // vr1025 = copy vr1024 diff --git a/lib/CodeGen/SimpleRegisterCoalescing.h b/lib/CodeGen/SimpleRegisterCoalescing.h index a381ae78afe..7f282a43dd7 100644 --- a/lib/CodeGen/SimpleRegisterCoalescing.h +++ b/lib/CodeGen/SimpleRegisterCoalescing.h @@ -204,7 +204,8 @@ namespace llvm { /// ValueLiveAt - Return true if the LiveRange pointed to by the given /// iterator, or any subsequent range with the same value number, /// is live at the given point. - bool ValueLiveAt(LiveInterval::iterator LRItr, LiveIndex defPoint) const; + bool ValueLiveAt(LiveInterval::iterator LRItr, LiveInterval::iterator LREnd, + LiveIndex defPoint) const; /// RangeIsDefinedByCopyFromReg - Return true if the specified live range of /// the specified live interval is defined by a copy from the specified