Address comments

Author: arcbbb

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -2419,14 +2419,13 @@ void VPlanTransforms::canonicalizeEVLLoops(VPlan &Plan) {
   EVLPhi->eraseFromParent();
 
   // Replace CanonicalIVInc with EVL-PHI increment.
-  VPRecipeBase *CanonicalIV = &*HeaderVPBB->begin();
+  auto *CanonicalIV = cast<VPPhi>(&*HeaderVPBB->begin());
   assert(
-      isa<VPPhi>(CanonicalIV) &&
-      match(CanonicalIV->getOperand(1),
+      match(CanonicalIV->getIncomingValue(1),
             m_c_Binary<Instruction::Add>(m_Specific(cast<VPPhi>(CanonicalIV)),
                                          m_Specific(&Plan.getVFxUF()))) &&
-      "Unexpected canoincal iv");
-  VPValue *Backedge = CanonicalIV->getOperand(1);
+      "Unexpected canonical iv");
+  VPValue *Backedge = CanonicalIV->getIncomingValue(1);
   Backedge->replaceAllUsesWith(EVLIncrement);
 
   // Remove unused phi and increment.

llvm/lib/Transforms/Vectorize/VPlanVerifier.cpp

@@ -197,7 +197,7 @@ bool VPlanVerifier::verifyEVLRecipe(const VPInstruction &EVL) const {
           // EVLIVIncrement is only used by EVLIV & BranchOnCount.
           // Having more than two users is unexpected.
           if ((I->getNumUsers() != 1) &&
-              (I->getNumUsers() != 2 || !any_of(I->users(), [&I](VPUser *U) {
+              (I->getNumUsers() != 2 || none_of(I->users(), [&I](VPUser *U) {
                  using namespace llvm::VPlanPatternMatch;
                  return match(U, m_BranchOnCount(m_Specific(I), m_VPValue()));
                }))) {