From cef6010c64bc56fa2a8f1e7e9e28b8821adeceac Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Thu, 20 Oct 2005 22:50:10 +0000 Subject: [PATCH] Fix a conditional so we don't access past the end of the range. Thanks to Andrew for bringing this to my attn. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23850 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveInterval.cpp | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index 50d8a259367..a7f1eb357ee 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -218,12 +218,10 @@ void LiveInterval::extendIntervalEndTo(Ranges::iterator I, unsigned NewEnd) { // If the newly formed range now touches the range after it and if they have // the same value number, merge the two ranges into one range. - if (I != ranges.end()) { - Ranges::iterator Next = next(I); - if (Next->start == I->end && Next->ValId == ValId) { - I->end = Next->end; - ranges.erase(Next); - } + Ranges::iterator Next = next(I); + if (Next != ranges.end() && Next->start == I->end && Next->ValId == ValId) { + I->end = Next->end; + ranges.erase(Next); } }