2 files changed, 42 insertions, 4 deletions

diff --git a/llvm/lib/FuzzMutate/Operations.cpp b/llvm/lib/FuzzMutate/Operations.cpp
index 8bc902edc9c..af2775ebcfb 100644
--- a/llvm/lib/FuzzMutate/Operations.cpp
+++ b/llvm/lib/FuzzMutate/Operations.cpp
@@ -216,8 +216,9 @@ OpDescriptor llvm::fuzzerop::extractValueDescriptor(unsigned Weight) {
 
 static SourcePred matchScalarInAggregate() {
   auto Pred = [](ArrayRef<Value *> Cur, const Value *V) {
-    if (isa<ArrayType>(Cur[0]->getType()))
-      return V->getType() == Cur[0]->getType();
+    if (auto *ArrayT = dyn_cast<ArrayType>(Cur[0]->getType()))
+      return V->getType() == ArrayT->getElementType();
+
     auto *STy = cast<StructType>(Cur[0]->getType());
     for (int I = 0, E = STy->getNumElements(); I < E; ++I)
       if (STy->getTypeAtIndex(I) == V->getType())
@@ -225,8 +226,9 @@ static SourcePred matchScalarInAggregate() {
     return false;
   };
   auto Make = [](ArrayRef<Value *> Cur, ArrayRef<Type *>) {
-    if (isa<ArrayType>(Cur[0]->getType()))
-      return makeConstantsWithType(Cur[0]->getType());
+    if (auto *ArrayT = dyn_cast<ArrayType>(Cur[0]->getType()))
+      return makeConstantsWithType(ArrayT->getElementType());
+
     std::vector<Constant *> Result;
     auto *STy = cast<StructType>(Cur[0]->getType());
     for (int I = 0, E = STy->getNumElements(); I < E; ++I)
diff --git a/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp b/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
index 5e1b338a95f..7d69bda91cc 100644
--- a/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
+++ b/llvm/unittests/FuzzMutate/RandomIRBuilderTest.cpp
@@ -164,4 +164,40 @@ TEST(RandomIRBuilderTest, ShuffleVectorSink) {
   }
 }
 
+TEST(RandomIRBuilderTest, InsertValueArray) {
+  // Check that we can generate insertvalue for the vector operations
+
+  LLVMContext Ctx;
+  const char *SourceCode =
+      "define void @test() {\n"
+      "  %A = alloca [8 x i32]\n"
+      "  %L = load [8 x i32], [8 x i32]* %A"
+      "  ret void\n"
+      "}";
+  auto M = parseAssembly(SourceCode, Ctx);
+
+  fuzzerop::OpDescriptor Descr = fuzzerop::insertValueDescriptor(1);
+
+  std::vector<Type *> Types =
+      {Type::getInt8Ty(Ctx), Type::getInt32Ty(Ctx), Type::getInt64Ty(Ctx)};
+  RandomIRBuilder IB(Seed, Types);
+
+  // Get first basic block of the first function
+  Function &F = *M->begin();
+  BasicBlock &BB = *F.begin();
+
+  // Pick first source
+  Instruction *Source = &*std::next(BB.begin());
+  ASSERT_TRUE(Descr.SourcePreds[0].matches({}, Source));
+
+  SmallVector<Value *, 2> Srcs(2);
+
+  // Check that we can always pick the last two operands.
+  for (int i = 0; i < 10; ++i) {
+    Srcs[0] = Source;
+    Srcs[1] = IB.findOrCreateSource(BB, {Source}, Srcs, Descr.SourcePreds[1]);
+    IB.findOrCreateSource(BB, {}, Srcs, Descr.SourcePreds[2]);
+  }
+}
+
 }