Be more agressive when joining ranges.

llvm-svn: 11575
This commit is contained in:
Alkis Evlogimenos 2004-02-18 04:38:37 +00:00
parent 5c90efed55
commit c394f7803b

View File

@ -625,10 +625,10 @@ void LiveIntervals::Interval::join(const LiveIntervals::Interval& other)
LiveIntervals::Interval::Ranges::iterator LiveIntervals::Interval::Ranges::iterator
LiveIntervals::Interval::mergeRangesForward(Ranges::iterator it) LiveIntervals::Interval::mergeRangesForward(Ranges::iterator it)
{ {
for (Ranges::iterator next = it + 1; for (Ranges::iterator n = next(it);
next != ranges.end() && it->second >= next->first; ) { n != ranges.end() && ((it->second & 1) + it->second) >= n->first; ) {
it->second = std::max(it->second, next->second); it->second = std::max(it->second, n->second);
next = ranges.erase(next); n = ranges.erase(n);
} }
return it; return it;
} }
@ -637,12 +637,12 @@ LiveIntervals::Interval::Ranges::iterator
LiveIntervals::Interval::mergeRangesBackward(Ranges::iterator it) LiveIntervals::Interval::mergeRangesBackward(Ranges::iterator it)
{ {
while (it != ranges.begin()) { while (it != ranges.begin()) {
Ranges::iterator prev = it - 1; Ranges::iterator p = prior(it);
if (it->first > prev->second) break; if (it->first > ((p->second & 1) + p->second)) break;
it->first = std::min(it->first, prev->first); it->first = std::min(it->first, p->first);
it->second = std::max(it->second, prev->second); it->second = std::max(it->second, p->second);
it = ranges.erase(prev); it = ranges.erase(p);
} }
return it; return it;