!fixup use static cast, add helper.

Author: fhahn

llvm/include/llvm/Transforms/Vectorize/LoopVectorizationLegality.h

@@ -301,6 +301,11 @@ class LoopVectorizationLegality {
   /// Returns the reduction variables found in the loop.
   const ReductionList &getReductionVars() const { return Reductions; }
 
+  RecurrenceDescriptor getRecurrenceDescriptor(PHINode *PN) const {
+    assert(Reductions.contains(PN) && "no recurrence descriptor for phi");
+    return Reductions.lookup(PN);
+  }
+
   /// Returns the induction variables found in the loop.
   const InductionList &getInductionVars() const { return Inductions; }
 

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -9173,7 +9173,7 @@ void LoopVectorizationPlanner::adjustRecipesForReductions(
       if (CM.blockNeedsPredicationForAnyReason(CurrentLinkI->getParent()))
         CondOp = RecipeBuilder.getBlockInMask(CurrentLink->getParent());
 
-      const RecurrenceDescriptor &RdxDesc = Legal->getReductionVars().lookup(
+      RecurrenceDescriptor RdxDesc = Legal->getRecurrenceDescriptor(
           cast<PHINode>(PhiR->getUnderlyingInstr()));
       // Non-FP RdxDescs will have all fast math flags set, so clear them.
       FastMathFlags FMFs = isa<FPMathOperator>(CurrentLinkI)

llvm/lib/Transforms/Vectorize/VPlanRecipes.cpp

@@ -740,8 +740,8 @@ Value *VPInstruction::generate(VPTransformState &State) {
     Value *ReducedPartRdx = State.get(getOperand(2));
     for (unsigned Idx = 3; Idx < getNumOperands(); ++Idx)
       ReducedPartRdx = Builder.CreateBinOp(
-          (Instruction::BinaryOps)RecurrenceDescriptor::getOpcode(
-              RecurKind::AnyOf),
+          static_cast<Instruction::BinaryOps>(
+              RecurrenceDescriptor::getOpcode(RecurKind::AnyOf)),
           State.get(getOperand(Idx)), ReducedPartRdx, "bin.rdx");
     return createAnyOfReduction(Builder, ReducedPartRdx,
                                 State.get(getOperand(1), VPLane(0)), OrigPhi);