summaryrefslogtreecommitdiffstats
path: root/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp')
-rw-r--r--llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp b/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
index c27523ae131..79ba3d20420 100644
--- a/llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp
+++ b/llvm/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 &&
OpenPOWER on IntegriCloud