From: Jakob Stoklund Olesen Date: Tue, 13 Jul 2010 19:42:20 +0000 (+0000) Subject: Fix LiveInterval::overlaps so it doesn't claim touching intervals overlap. X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=186eb73845c29547cc837341f0c8c0f6d9284e67;p=oota-llvm.git Fix LiveInterval::overlaps so it doesn't claim touching intervals overlap. Also, one binary search is enough. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@108261 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp index 21a9b7d4db6..9b057b0fec2 100644 --- a/lib/CodeGen/LiveInterval.cpp +++ b/lib/CodeGen/LiveInterval.cpp @@ -161,16 +161,8 @@ bool LiveInterval::overlapsFrom(const LiveInterval& other, /// by [Start, End). bool LiveInterval::overlaps(SlotIndex Start, SlotIndex End) const { assert(Start < End && "Invalid range"); - const_iterator I = begin(); - const_iterator E = end(); - const_iterator si = std::upper_bound(I, E, Start); - const_iterator ei = std::upper_bound(I, E, End); - if (si != ei) - return true; - if (si == I) - return false; - --si; - return si->contains(Start); + const_iterator I = std::lower_bound(begin(), end(), End); + return I != begin() && (--I)->end > Start; } /// extendIntervalEndTo - This method is used when we want to extend the range