It is allowed to call IntervalMap::const_iterator::advanceTo() with a key that

moves the iterator to end(), and it is valid to call it on end().

That means it is valid to call advanceTo() with any monotonic key sequence.

llvm-svn: 122092
This commit is contained in:
Jakob Stoklund Olesen 2010-12-17 22:07:51 +00:00
parent 900ac27338
commit f17722908c
2 changed files with 16 additions and 0 deletions

View File

@ -1411,6 +1411,8 @@ public:
/// The search is started from the current position, and no earlier positions
/// can be found. This is much faster than find() for small moves.
void advanceTo(KeyT x) {
if (!valid())
return;
if (branched())
treeAdvanceTo(x);
else

View File

@ -247,6 +247,12 @@ TEST(IntervalMapTest, RootMultiCoalescing) {
EXPECT_EQ(140u, I.start());
EXPECT_EQ(150u, I.stop());
I.advanceTo(200);
EXPECT_FALSE(I.valid());
I.advanceTo(300);
EXPECT_FALSE(I.valid());
// Coalesce left with followers.
// [100;110] [120;130] [140;150] [160;170]
map.insert(111, 115, 1);
@ -520,6 +526,14 @@ TEST(IntervalMapTest, Branched2) {
EXPECT_EQ(2000u, I.start());
EXPECT_EQ(2005u, I.stop());
// advanceTo beyond end()
I.advanceTo(20000);
EXPECT_FALSE(I.valid());
// end().advanceTo() is valid as long as x > map.stop()
I.advanceTo(30000);
EXPECT_FALSE(I.valid());
// Test clear() on branched map.
map.clear();
EXPECT_TRUE(map.empty());