Fix the sense of joinable

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@15196 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2004-07-25 07:47:25 +00:00
parent d67e439241
commit c25b55a5b2
2 changed files with 5 additions and 5 deletions

View File

@ -116,16 +116,16 @@ bool LiveInterval::joinable(const LiveInterval &other, unsigned CopyIdx) const {
if (i->start == j->start) { if (i->start == j->start) {
// If this is not the allowed value merge, we cannot join. // If this is not the allowed value merge, we cannot join.
if (i->ValId != ThisValIdx || j->ValId != OtherValIdx) if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
return true; return false;
} else if (i->start < j->start) { } else if (i->start < j->start) {
if (i->end > j->start) { if (i->end > j->start) {
if (i->ValId != ThisValIdx || j->ValId != OtherValIdx) if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
return true; return false;
} }
} else { } else {
if (j->end > i->start) { if (j->end > i->start) {
if (i->ValId != ThisValIdx || j->ValId != OtherValIdx) if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
return true; return false;
} }
} }
if (i->end < j->end) if (i->end < j->end)
@ -134,7 +134,7 @@ bool LiveInterval::joinable(const LiveInterval &other, unsigned CopyIdx) const {
++j; ++j;
} }
return false; return true;
} }

View File

@ -577,7 +577,7 @@ void LiveIntervals::joinIntervalsInMachineBB(MachineBasicBlock *MBB) {
IntA.containsOneValue() && IntB.containsOneValue(); IntA.containsOneValue() && IntB.containsOneValue();
unsigned MIDefIdx = getDefIndex(getInstructionIndex(mi)); unsigned MIDefIdx = getDefIndex(getInstructionIndex(mi));
if ((TriviallyJoinable || !IntB.joinable(IntA, MIDefIdx)) && if ((TriviallyJoinable || IntB.joinable(IntA, MIDefIdx)) &&
!overlapsAliases(&IntA, &IntB)) { !overlapsAliases(&IntA, &IntB)) {
IntB.join(IntA, MIDefIdx); IntB.join(IntA, MIDefIdx);