!fixup address latest comments, thanks!

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.cpp

@@ -823,7 +823,7 @@ VPlan::~VPlan() {
 
     for (auto *VPB : CreatedBlocks) {
       if (auto *VPBB = dyn_cast<VPBasicBlock>(VPB)) {
-        // Replace all operands of recipes and all VPValues define in VPBB with
+        // Replace all operands of recipes and all VPValues defined in VPBB with
         // DummyValue so the block can be deleted.
         for (VPRecipeBase &R : *VPBB) {
           for (auto *Def : R.definedValues())
@@ -960,6 +960,7 @@ static void replaceVPBBWithIRVPBB(VPBasicBlock *VPBB, BasicBlock *IRBB) {
   }
 
   VPBlockUtils::reassociateBlocks(VPBB, IRVPBB);
+  // VPBB is now dead and will be cleaned up when the plan gets destroyed.
 }
 
 /// Generate the code inside the preheader and body of the vectorized loop.

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -4041,9 +4041,9 @@ class VPlan {
   VPIRBasicBlock *createEmptyVPIRBasicBlock(BasicBlock *IRBB);
 
   /// Create a VPIRBasicBlock from \p IRBB containing VPIRInstructions for all
-  /// instructions in \p IRBB, except its terminator which is managed in VPlan.
-  /// The returned block is owned by the VPlan and deleted once the VPlan is
-  /// destroyed.
+  /// instructions in \p IRBB, except its terminator which is managed by the
+  /// successors of the block in VPlan. The returned block is owned by the VPlan
+  /// and deleted once the VPlan is destroyed.
   VPIRBasicBlock *createVPIRBasicBlock(BasicBlock *IRBB);
 };
 

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -398,6 +398,7 @@ static bool mergeBlocksIntoPredecessors(VPlan &Plan) {
       VPBlockUtils::disconnectBlocks(VPBB, Succ);
       VPBlockUtils::connectBlocks(PredVPBB, Succ);
     }
+    // VPBB is now dead and will be cleaned up when the plan gets destroyed.
   }
   return !WorkList.empty();
 }

llvm/unittests/Transforms/Vectorize/VPlanTest.cpp

@@ -472,12 +472,9 @@ TEST_F(VPBasicBlockTest, TraversingIteratorTest) {
     VPBasicBlock *R1BB3 = Plan.createVPBasicBlock("R1BB3");
     VPRegionBlock *R1 = Plan.createVPRegionBlock(R1BB1, R1BB3, "R1");
 
-    VPBasicBlock *R2BB1 = Plan.createVPBasicBlock(""
-                                                  "R2BB1");
-    VPBasicBlock *R2BB2 = Plan.createVPBasicBlock(""
-                                                  "R2BB2");
-    VPBasicBlock *R2BB3 = Plan.createVPBasicBlock(""
-                                                  "R2BB3");
+    VPBasicBlock *R2BB1 = Plan.createVPBasicBlock("R2BB1");
+    VPBasicBlock *R2BB2 = Plan.createVPBasicBlock("R2BB2");
+    VPBasicBlock *R2BB3 = Plan.createVPBasicBlock("R2BB3");
     VPRegionBlock *R2 = Plan.createVPRegionBlock(R2BB1, R2BB3, "R2");
     R2BB2->setParent(R2);
     VPBlockUtils::connectBlocks(R2BB1, R2BB2);