!fixup address latest comments, thanks

Author: fhahn

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -8130,9 +8130,10 @@ VPRecipeBuilder::handleReplication(Instruction *I, ArrayRef<VPValue *> Operands,
           (Range.Start.isScalable() && isa<IntrinsicInst>(I))) &&
          "Should not predicate a uniform recipe");
   if (IsUniform && Instruction::isCast(I->getOpcode())) {
+    assert(!IsPredicated && "IsUniform implies unpredicated");
     auto *Recipe = new VPInstructionWithType(
         I->getOpcode(), Operands, I->getType(), VPIRFlags(*I), I->getDebugLoc(),
-        /*IsSingleScalar=*/true, I->getName());
+        IsUniform, I->getName());
     Recipe->setUnderlyingValue(I);
     return Recipe;
   }

llvm/lib/Transforms/Vectorize/VPlanTransforms.cpp

@@ -1038,9 +1038,10 @@ static void simplifyRecipe(VPRecipeBase &R, VPTypeAnalysis &TypeInfo) {
                                  ? Instruction::SExt
                                  : Instruction::ZExt;
         VPSingleDefRecipe *VPC;
-        if (vputils::isSingleScalar(R.getVPSingleValue()))
+        if (vputils::isSingleScalar(Def))
           VPC = new VPInstructionWithType(Instruction::CastOps(ExtOpcode), {A},
-                                          TruncTy, {}, {});
+                                          TruncTy, {}, {},
+                                          /*IsSingleScalar=*/true);
         else
           VPC = new VPWidenCastRecipe(Instruction::CastOps(ExtOpcode), A,
                                       TruncTy);