!fixup adjust check and message.

Author: fhahn

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -7201,7 +7201,7 @@ DenseMap<const SCEV *, Value *> LoopVectorizationPlanner::executePlan(
       return OptimizationRemarkAnalysis(DEBUG_TYPE, "VectorizationDead",
                                         OrigLoop->getStartLoc(),
                                         OrigLoop->getHeader())
-             << "Created vector loop never executes due insufficient trip "
+             << "Created vector loop never executes due to insufficient trip "
                 "count.";
     });
     return DenseMap<const SCEV *, Value *>();

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -2216,13 +2216,12 @@ void VPlanTransforms::removeBranchOnConst(VPlan &Plan) {
   for (VPBasicBlock *VPBB : VPBlockUtils::blocksOnly<VPBasicBlock>(
            vp_depth_first_shallow(Plan.getEntry()))) {
     VPValue *Cond;
-    // Skip blocks that don't have 2 successors or are not terminated by
-    // BranchOnCond. Empty blocks with 2 successors are also skipped; their
-    // branch condition will be added later.
-    if (VPBB->getNumSuccessors() != 2 || VPBB->empty() ||
-        !match(&VPBB->back(), m_BranchOnCond(m_VPValue(Cond))))
+    // Skip blocks that are not terminated by BranchOnCond.
+    if (VPBB->empty() || !match(&VPBB->back(), m_BranchOnCond(m_VPValue(Cond))))
       continue;
 
+    assert(VPBB->getNumSuccessors() == 2 &&
+           "Two successors expected for BranchOnCond");
     unsigned RemovedIdx;
     if (match(Cond, m_True()))
       RemovedIdx = 1;