diff options
Diffstat (limited to 'llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp')
| -rw-r--r-- | llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp | 5 | 
1 files changed, 3 insertions, 2 deletions
| diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 5862936a9e8..093da6f6e40 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -18948,13 +18948,14 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,    if (N2 == N3) return N2;    EVT CmpOpVT = N0.getValueType(); +  EVT CmpResVT = getSetCCResultType(CmpOpVT);    EVT VT = N2.getValueType();    auto *N1C = dyn_cast<ConstantSDNode>(N1.getNode());    auto *N2C = dyn_cast<ConstantSDNode>(N2.getNode());    auto *N3C = dyn_cast<ConstantSDNode>(N3.getNode());    // Determine if the condition we're dealing with is constant. -  if (SDValue SCC = DAG.FoldSetCC(VT, N0, N1, CC, DL)) { +  if (SDValue SCC = DAG.FoldSetCC(CmpResVT, N0, N1, CC, DL)) {      AddToWorklist(SCC.getNode());      if (auto *SCCC = dyn_cast<ConstantSDNode>(SCC)) {        // fold select_cc true, x, y -> x @@ -19021,7 +19022,7 @@ SDValue DAGCombiner::SimplifySelectCC(const SDLoc &DL, SDValue N0, SDValue N1,      SDValue Temp, SCC;      // zext (setcc n0, n1)      if (LegalTypes) { -      SCC = DAG.getSetCC(DL, getSetCCResultType(CmpOpVT), N0, N1, CC); +      SCC = DAG.getSetCC(DL, CmpResVT, N0, N1, CC);        if (VT.bitsLT(SCC.getValueType()))          Temp = DAG.getZeroExtendInReg(SCC, SDLoc(N2), VT);        else | 

