Inline EVLPHI lookup

Author: lukel97

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -4118,11 +4118,6 @@ class LLVM_ABI_FOR_TEST VPRegionBlock : public VPBlockBase {
     return const_cast<VPRegionBlock *>(this)->getCanonicalIV();
   }
 
-  VPEVLBasedIVPHIRecipe *getEVLBasedIV() {
-    return dyn_cast<VPEVLBasedIVPHIRecipe>(
-        std::next(getCanonicalIV()->getIterator()));
-  }
-
   /// Return the type of the canonical IV for loop regions.
   Type *getCanonicalIVType() { return getCanonicalIV()->getScalarType(); }
   const Type *getCanonicalIVType() const {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -610,8 +610,9 @@ createScalarIVSteps(VPlan &Plan, InductionDescriptor::InductionKind Kind,
                     VPBuilder &Builder) {
   VPRegionBlock *LoopRegion = Plan.getVectorLoopRegion();
   VPBasicBlock *HeaderVPBB = LoopRegion->getEntryBasicBlock();
-  VPValue *IV = LoopRegion->getCanonicalIV();
-  if (auto *EVLIV = LoopRegion->getEVLBasedIV())
+  VPHeaderPHIRecipe *IV = LoopRegion->getCanonicalIV();
+  if (auto *EVLIV =
+          dyn_cast<VPEVLBasedIVPHIRecipe>(std::next(IV->getIterator())))
     IV = EVLIV;
   VPSingleDefRecipe *BaseIV =
       Builder.createDerivedIV(Kind, FPBinOp, StartV, IV, Step, "offset.idx");