From 81f64c04d79af054e26be1beb435bf9c6e75f0c6 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Thu, 28 May 2015 21:29:59 +0000 Subject: [PATCH] [SelectionDAG] Scalar shift amounts may require legalization The shift amount may be too small to cope with promoted left hand side, make sure to promote it as well. This fixes PR23664. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@238503 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp index eeaebf780cc..278929dff22 100644 --- a/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp +++ b/lib/CodeGen/SelectionDAG/LegalizeIntegerTypes.cpp @@ -604,7 +604,8 @@ SDValue DAGTypeLegalizer::PromoteIntRes_SETCC(SDNode *N) { SDValue DAGTypeLegalizer::PromoteIntRes_SHL(SDNode *N) { SDValue Res = GetPromotedInteger(N->getOperand(0)); SDValue Amt = N->getOperand(1); - Amt = Amt.getValueType().isVector() ? ZExtPromotedInteger(Amt) : Amt; + if (!TLI.isTypeLegal(Amt.getValueType())) + Amt = ZExtPromotedInteger(N->getOperand(1)); return DAG.getNode(ISD::SHL, SDLoc(N), Res.getValueType(), Res, Amt); } @@ -628,7 +629,8 @@ SDValue DAGTypeLegalizer::PromoteIntRes_SRA(SDNode *N) { // The input value must be properly sign extended. SDValue Res = SExtPromotedInteger(N->getOperand(0)); SDValue Amt = N->getOperand(1); - Amt = Amt.getValueType().isVector() ? ZExtPromotedInteger(Amt) : Amt; + if (!TLI.isTypeLegal(Amt.getValueType())) + Amt = ZExtPromotedInteger(N->getOperand(1)); return DAG.getNode(ISD::SRA, SDLoc(N), Res.getValueType(), Res, Amt); } @@ -636,7 +638,8 @@ SDValue DAGTypeLegalizer::PromoteIntRes_SRL(SDNode *N) { // The input value must be properly zero extended. SDValue Res = ZExtPromotedInteger(N->getOperand(0)); SDValue Amt = N->getOperand(1); - Amt = Amt.getValueType().isVector() ? ZExtPromotedInteger(Amt) : Amt; + if (!TLI.isTypeLegal(Amt.getValueType())) + Amt = ZExtPromotedInteger(N->getOperand(1)); return DAG.getNode(ISD::SRL, SDLoc(N), Res.getValueType(), Res, Amt); } -- 2.11.0