6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-12 17:32:19 +00:00
Code Issues Projects Releases Wiki Activity

Fix crash when IntervalMapOverlaps::advanceTo moves past the last overlap.

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@122081 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2010-12-17 19:18:38 +00:00
parent a3dbd3a244
commit 4aec85ae01
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
include/llvm/ADT/IntervalMap.h
View File

@ -2036,6 +2036,8 @@ class IntervalMapOverlaps {
/// either meets end.
/// Don't move the iterators if they are already overlapping.
void advance() {
if (!valid())
return;
for (;;) {
// Make a.end > b.start.
posA.advanceTo(posB.start());
@ -2052,10 +2054,7 @@ public:
/// IntervalMapOverlaps - Create an iterator for the overlaps of a and b.
IntervalMapOverlaps(const MapA &a, const MapB &b)
: posA(b.empty() ? a.end() : a.find(b.start())),
posB(posA.valid() ? b.find(posA.start()) : b.end()) {
if (valid())
advance();
}
posB(posA.valid() ? b.find(posA.start()) : b.end()) { advance(); }
/// valid - Return true if iterator is at an overlap.
bool valid() const {
@ -2090,7 +2089,7 @@ public:
// Second half-loop of advance().
posB.advanceTo(posA.start());
if (!posB.valid() || !Traits::stopLess(posA.stop(), posB.start()))
return ;
return;
advance();
}
@ -2098,7 +2097,7 @@ public:
void skipB() {
++posB;
if (!posB.valid() || !Traits::stopLess(posA.stop(), posB.start()))
return;
return;
advance();
}

6
unittests/ADT/IntervalMapTest.cpp
View File

@ -586,7 +586,11 @@ TEST(IntervalMapOverlapsTest, SmallMaps) {
ASSERT_TRUE(BA.valid());
EXPECT_EQ(3u, BA.a().start());
EXPECT_EQ(4u, BA.b().start());
++BA;
// advance past end.
BA.advanceTo(6);
EXPECT_FALSE(BA.valid());
// advance an invalid iterator.
BA.advanceTo(7);
EXPECT_FALSE(BA.valid());
}