Rebase && change some name of variable

Author: LiqinWeng

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -1479,23 +1479,23 @@ static VPRecipeBase *createEVLRecipe(VPValue *HeaderMask,
         VPValue *NewMask = GetNewMask(Red->getCondOp());
         return new VPReductionEVLRecipe(*Red, EVL, NewMask);
       })
-      .Case<VPWidenIntrinsicRecipe, VPWidenCastRecipe>([&](auto *CInst)
+      .Case<VPWidenIntrinsicRecipe, VPWidenCastRecipe>([&](auto *CR)
                                                            -> VPRecipeBase * {
         Intrinsic::ID VPID;
-        if (auto *CallInst = dyn_cast<VPWidenIntrinsicRecipe>(CInst))
-          VPID = VPIntrinsic::getForIntrinsic(CallInst->getVectorIntrinsicID());
-        else if (auto *CastInst = dyn_cast<VPWidenCastRecipe>(CInst))
-          VPID = VPIntrinsic::getForOpcode(CastInst->getOpcode());
+        if (auto *CallR = dyn_cast<VPWidenIntrinsicRecipe>(CR))
+          VPID = VPIntrinsic::getForIntrinsic(CallR->getVectorIntrinsicID());
+        else if (auto *CastR = dyn_cast<VPWidenCastRecipe>(CR))
+          VPID = VPIntrinsic::getForOpcode(CastR->getOpcode());
         assert(VPID != Intrinsic::not_intrinsic && "Expected VP intrinsic");
         assert(VPIntrinsic::getMaskParamPos(VPID) &&
                VPIntrinsic::getVectorLengthParamPos(VPID) &&
                "Expected VP intrinsic");
 
-        SmallVector<VPValue *> Ops(CInst->operands());
+        SmallVector<VPValue *> Ops(CR->operands());
         Ops.push_back(&AllOneMask);
         Ops.push_back(&EVL);
         return new VPWidenIntrinsicRecipe(
-            VPID, Ops, TypeInfo.inferScalarType(CInst), CInst->getDebugLoc());
+            VPID, Ops, TypeInfo.inferScalarType(CR), CR->getDebugLoc());
       })
       .Case<VPWidenSelectRecipe>([&](VPWidenSelectRecipe *Sel) {
         SmallVector<VPValue *> Ops(Sel->operands());