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

[Nate Begeman]

Changes in directory llvm/lib/CodeGen/SelectionDAG:

SelectionDAG.cpp updated: 1.197 -> 1.198
---
Log message:

Let the combiner handle more cases


---
Diffs of the changes:  (+4 -1)

 SelectionDAG.cpp |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletion(-)


Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff -u llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.197 llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.198
--- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp:1.197	Wed Oct  5 01:47:48 2005
+++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp	Wed Oct  5 16:44:43 2005
@@ -854,6 +854,7 @@
       return getSetCC(VT, N2, N1, ISD::getSetCCSwappedOperands(Cond));
     }
 
+  if (!CombinerEnabled) {
   if (N1 == N2) {
     // We can always fold X == Y for integer setcc's.
     if (MVT::isInteger(N1.getValueType()))
@@ -979,7 +980,7 @@
       N1 = getNode(ISD::ZERO_EXTEND, VT, N1);
     return N1;
   }
-
+  }
   // Could not fold it.
   return SDOperand();
 }
@@ -1807,6 +1808,7 @@
 
     if (N2 == N3) return N2;   // select C, X, X -> X
 
+    if (!CombinerEnabled) {
     if (VT == MVT::i1) {  // Boolean SELECT
       if (N2C) {
         if (N2C->getValue())   // select C, 1, X -> C | X
@@ -1834,6 +1836,7 @@
                              N3, cast<CondCodeSDNode>(N1.getOperand(2))->get());
       if (Simp.Val) return Simp;
     }
+    }
     break;
   case ISD::BRCOND:
     if (N2C)