!fixup pass IsSingleScalar to constructor.

Author: fhahn

llvm/lib/Transforms/Vectorize/LoopVectorizationPlanner.h

@@ -175,8 +175,8 @@ class VPBuilder {
                               std::initializer_list<VPValue *> Operands,
                               Type *ResultTy, const VPIRFlags &Flags = {},
                               DebugLoc DL = {}, const Twine &Name = "") {
-    return tryInsertInstruction(
-        new VPInstructionWithType(Opcode, Operands, ResultTy, Flags, DL, Name));
+    return tryInsertInstruction(new VPInstructionWithType(
+        Opcode, Operands, ResultTy, Flags, DL, /*IsSingleScalar=*/false, Name));
   }
 
   VPInstruction *createOverflowingOp(unsigned Opcode,
@@ -264,8 +264,8 @@ class VPBuilder {
 
   VPInstruction *createScalarCast(Instruction::CastOps Opcode, VPValue *Op,
                                   Type *ResultTy, DebugLoc DL) {
-    return tryInsertInstruction(
-        new VPInstructionWithType(Opcode, Op, ResultTy, {}, DL));
+    return tryInsertInstruction(new VPInstructionWithType(
+        Opcode, Op, ResultTy, {}, DL, /*IsSingleScalar=*/true));
   }
 
   VPWidenCastRecipe *createWidenCast(Instruction::CastOps Opcode, VPValue *Op,

llvm/lib/Transforms/Vectorize/LoopVectorize.cpp

@@ -8130,9 +8130,9 @@ 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())) {
-    auto *Recipe = new VPInstructionWithType(I->getOpcode(), Operands,
-                                             I->getType(), VPIRFlags(*I),
-                                             I->getDebugLoc(), I->getName());
+    auto *Recipe = new VPInstructionWithType(
+        I->getOpcode(), Operands, I->getType(), VPIRFlags(*I), I->getDebugLoc(),
+        /*IsSingleScalar=*/true, I->getName());
     Recipe->setUnderlyingValue(I);
     return Recipe;
   }

llvm/lib/Transforms/Vectorize/VPlan.h

@@ -1070,7 +1070,7 @@ class VPInstructionWithType : public VPInstruction {
 public:
   VPInstructionWithType(unsigned Opcode, ArrayRef<VPValue *> Operands,
                         Type *ResultTy, const VPIRFlags &Flags, DebugLoc DL,
-                        const Twine &Name = "")
+                        bool SingleScalar = false, const Twine &Name = "")
       : VPInstruction(Opcode, Operands, Flags, DL, Name, true),
         ResultTy(ResultTy) {}
 
@@ -1099,7 +1099,7 @@ class VPInstructionWithType : public VPInstruction {
     SmallVector<VPValue *, 2> Operands(operands());
     auto *New =
         new VPInstructionWithType(getOpcode(), Operands, getResultType(), *this,
-                                  getDebugLoc(), getName());
+                                  getDebugLoc(), isSingleScalar(), getName());
     New->setUnderlyingValue(getUnderlyingValue());
     return New;
   }