Fix LiveInterval::getOverlapingRanges to take things in the right order

(an unused method).

Fix the merger so that it can merge ranges like this  [10:12)[16:40) with
[12:38) into [10:40) instead of bogus ranges.  This sort of input will be
possible for the merger coming shortly

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@23865 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/CodeGen/LiveInterval.cpp b/lib/CodeGen/LiveInterval.cpp
index a7f1eb357eeb2c7011381f5e7ebd97fb9211c929..b0f09297b3e298c09b5e37af5b420236c374de84 100644 (file)
--- a/lib/CodeGen/LiveInterval.cpp
+++ b/lib/CodeGen/LiveInterval.cpp
@@ -164,8 +164,8 @@ bool LiveInterval::joinable(const LiveInterval &other, unsigned CopyIdx) const {
 void LiveInterval::getOverlapingRanges(const LiveInterval &other, 
                                        unsigned CopyIdx,
                                        std::vector<LiveRange*> &Ranges) {
-  const LiveRange *SourceLR = other.getLiveRangeContaining(CopyIdx-1);
-  const LiveRange *DestLR = getLiveRangeContaining(CopyIdx);
+  const LiveRange *SourceLR = getLiveRangeContaining(CopyIdx-1);
+  const LiveRange *DestLR = other.getLiveRangeContaining(CopyIdx);
   assert(SourceLR && DestLR && "Not joining due to a copy?");
   unsigned OtherValIdx = SourceLR->ValId;
   unsigned ThisValIdx = DestLR->ValId;
@@ -219,7 +219,7 @@ 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.
   Ranges::iterator Next = next(I);
-  if (Next != ranges.end() && Next->start == I->end && Next->ValId == ValId) {
+  if (Next != ranges.end() && Next->start <= I->end && Next->ValId == ValId) {
     I->end = Next->end;
     ranges.erase(Next);
   }