[llvm-commits] CVS: llvm/lib/CodeGen/LiveInterval.cpp LiveIntervalAnalysis.cpp

[Chris Lattner]

Changes in directory llvm/lib/CodeGen:

LiveInterval.cpp updated: 1.10 -> 1.11
LiveIntervalAnalysis.cpp updated: 1.113 -> 1.114

---
Log message:

Fix the sense of joinable


---
Diffs of the changes:  (+5 -5)

Index: llvm/lib/CodeGen/LiveInterval.cpp
diff -u llvm/lib/CodeGen/LiveInterval.cpp:1.10 llvm/lib/CodeGen/LiveInterval.cpp:1.11
--- llvm/lib/CodeGen/LiveInterval.cpp:1.10	Sun Jul 25 02:11:19 2004
+++ llvm/lib/CodeGen/LiveInterval.cpp	Sun Jul 25 02:47:25 2004
@@ -116,16 +116,16 @@
     if (i->start == j->start) {
       // If this is not the allowed value merge, we cannot join.
       if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
-        return true;
+        return false;
     } else if (i->start < j->start) {
       if (i->end > j->start) {
         if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
-          return true;
+          return false;
       }
     } else {
       if (j->end > i->start) {
         if (i->ValId != ThisValIdx || j->ValId != OtherValIdx)
-          return true;
+          return false;
       }
     }
     if (i->end < j->end)
@@ -134,7 +134,7 @@
       ++j;
   }
 
-  return false;
+  return true;
 }
 
 


Index: llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
diff -u llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.113 llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.114
--- llvm/lib/CodeGen/LiveIntervalAnalysis.cpp:1.113	Sun Jul 25 00:45:18 2004
+++ llvm/lib/CodeGen/LiveIntervalAnalysis.cpp	Sun Jul 25 02:47:25 2004
@@ -577,7 +577,7 @@
         IntA.containsOneValue() && IntB.containsOneValue();
 
       unsigned MIDefIdx = getDefIndex(getInstructionIndex(mi));
-      if ((TriviallyJoinable || !IntB.joinable(IntA, MIDefIdx)) &&
+      if ((TriviallyJoinable || IntB.joinable(IntA, MIDefIdx)) &&
           !overlapsAliases(&IntA, &IntB)) {
         IntB.join(IntA, MIDefIdx);