Fix a problem duraid encountered on itanium where this folding:

select (x < y), 1, 0 -> (x < y) incorrectly: the setcc returns i1 but the
select returned i32.  Add the zero extend as needed.

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

diff --git a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index c27523ae13133d3ec09325f872f5df0ae1ee2428..79ba3d204207764b472b3654459c92a09f1dc8a0 100644 (file)
--- a/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
@@ -974,8 +974,12 @@ SDOperand SelectionDAG::SimplifySelectCC(SDOperand N1, SDOperand N2,
   // Check to see if this is the equivalent of setcc
   if (N4C && N4C->isNullValue() && N3C && (N3C->getValue() == 1ULL)) {
     MVT::ValueType XType = N1.getValueType();
-    if (TLI.isOperationLegal(ISD::SETCC, TLI.getSetCCResultTy()))
-      return getSetCC(TLI.getSetCCResultTy(), N1, N2, CC);
+    if (TLI.isOperationLegal(ISD::SETCC, TLI.getSetCCResultTy())) {
+      SDOperand Res = getSetCC(TLI.getSetCCResultTy(), N1, N2, CC);
+      if (Res.getValueType() != VT)
+        Res = getNode(ISD::ZERO_EXTEND, VT, Res);
+      return Res;
+    }
 
     // seteq X, 0 -> srl (ctlz X, log2(size(X)))
     if (N2C && N2C->isNullValue() && CC == ISD::SETEQ &&