Merge branch 'main' into vplan-runtime-checks

Author: fhahn

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -4154,6 +4154,21 @@ class VPBlockUtils {
       return cast<BlockTy>(&Block);
     });
   }
+
+  static void insertOnEdge(VPBlockBase *From, VPBlockBase *To,
+                           VPBlockBase *BlockPtr) {
+    unsigned SuccIdx =
+        std::distance(From->getSuccessors().begin(),
+                      find_if(From->getSuccessors(),
+                              [To](VPBlockBase *Succ) { return To == Succ; }));
+    unsigned PredIx =
+        std::distance(To->getPredecessors().begin(),
+                      find_if(To->getPredecessors(), [From](VPBlockBase *Pred) {
+                        return From == Pred;
+                      }));
+    VPBlockUtils::connectBlocks(From, BlockPtr, -1, SuccIdx);
+    VPBlockUtils::connectBlocks(BlockPtr, To, PredIx, -1);
+  }
 };
 
 class VPInterleavedAccessInfo {

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -360,9 +360,7 @@ static void addReplicateRegions(VPlan &Plan) {
     // Record predicated instructions for above packing optimizations.
     VPBlockBase *Region = createReplicateRegion(RepR, Plan);
     Region->setParent(CurrentBlock->getParent());
-    VPBlockUtils::disconnectBlocks(CurrentBlock, SplitBlock);
-    VPBlockUtils::connectBlocks(CurrentBlock, Region);
-    VPBlockUtils::connectBlocks(Region, SplitBlock);
+    VPBlockUtils::insertOnEdge(CurrentBlock, SplitBlock, Region);
   }
 }