From 6ec4a8b575ca89640210d6fa0b099306b6267f11 Mon Sep 17 00:00:00 2001 From: Sanjay Patel Date: Mon, 10 Sep 2018 18:37:59 +0000 Subject: [PATCH] [InstCombine] use SelectInst operand names to make code clearer; NFC Cleanup step for D51433. llvm-svn: 341850 --- .../InstCombineSimplifyDemanded.cpp | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp b/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp index c5fe5561c0b..78de6dfe7f4 100644 --- a/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp +++ b/lib/Transforms/InstCombine/InstCombineSimplifyDemanded.cpp @@ -1260,13 +1260,15 @@ Value *InstCombiner::SimplifyDemandedVectorElts(Value *V, APInt DemandedElts, break; } case Instruction::Select: { + SelectInst *Sel = cast(I); + Value *Cond = Sel->getCondition(); + APInt DemandedLHS(DemandedElts), DemandedRHS(DemandedElts); - if (auto *CV = dyn_cast(I->getOperand(0))) { + if (auto *CV = dyn_cast(Cond)) { for (unsigned i = 0; i < VWidth; i++) { + // isNullValue() always returns false when called on a ConstantExpr. + // Skip constant expressions to avoid propagating incorrect information. Constant *CElt = CV->getAggregateElement(i); - // Method isNullValue always returns false when called on a - // ConstantExpr. If CElt is a ConstantExpr then skip it in order to - // to avoid propagating incorrect information. if (isa(CElt)) continue; if (CElt->isNullValue()) @@ -1276,15 +1278,15 @@ Value *InstCombiner::SimplifyDemandedVectorElts(Value *V, APInt DemandedElts, } } - if (Value *V = SimplifyDemandedVectorElts(I->getOperand(1), DemandedLHS, + if (Value *V = SimplifyDemandedVectorElts(Sel->getTrueValue(), DemandedLHS, UndefElts2, Depth + 1)) { - I->setOperand(1, V); + Sel->setTrueValue(V); MadeChange = true; } - if (Value *V = SimplifyDemandedVectorElts(I->getOperand(2), DemandedRHS, + if (Value *V = SimplifyDemandedVectorElts(Sel->getFalseValue(), DemandedRHS, UndefElts3, Depth + 1)) { - I->setOperand(2, V); + Sel->setFalseValue(V); MadeChange = true; }