!fixup address latest comments, thanks!

Author: fhahn

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -9374,9 +9374,7 @@ static void addScalarResumePhis(VPRecipeBuilder &Builder, VPlan &Plan,
 }
 
 // Collect VPIRInstructions for phis in the exit block from the latch only.
-static SetVector<VPIRInstruction *>
-collectUsersInLatchExitBlock(Loop *OrigLoop, VPRecipeBuilder &Builder,
-                             VPlan &Plan) {
+static SetVector<VPIRInstruction *> collectUsersInLatchExitBlock(VPlan &Plan) {
   SetVector<VPIRInstruction *> ExitUsersToFix;
   for (VPIRBasicBlock *ExitVPBB : Plan.getExitBlocks()) {
     // Nothing to do for unreachable exit blocks.
@@ -9763,7 +9761,7 @@ LoopVectorizationPlanner::tryToBuildVPlanWithVPRecipes(VFRange &Range) {
   DenseMap<VPValue *, VPValue *> IVEndValues;
   addScalarResumePhis(RecipeBuilder, *Plan, IVEndValues);
   SetVector<VPIRInstruction *> ExitUsersToFix =
-      collectUsersInLatchExitBlock(OrigLoop, RecipeBuilder, *Plan);
+      collectUsersInLatchExitBlock(*Plan);
   addExitUsersForFirstOrderRecurrences(*Plan, ExitUsersToFix);
   addUsersInExitBlocks(*Plan, ExitUsersToFix);
 

llvm/lib/Transforms/Vectorize/VPlanConstruction.cpp

@@ -354,8 +354,9 @@ std::unique_ptr<VPlan> PlainCFGBuilder::buildPlainCFG(
 
   // Fix VPlan loop-closed-ssa exit phi's by adding incoming operands to the
   // VPIRInstructions wrapping them.
-  // Note that the operand order may need adjusting when predecessors are added,
-  // if an exit block has multiple predecessor.
+  // // Note that the operand order corresponds to IR predecessor order, and may
+  // need adjusting when VPlan predecessors are added, if an exit block has
+  // multiple predecessor.
   for (auto *EB : Plan->getExitBlocks()) {
     for (VPRecipeBase &R : EB->phis()) {
       auto *PhiR = cast<VPIRPhi>(&R);