[FuzzMutate] Inst deleter doesn't work with PhiNodes
Differential Revision: https://reviews.llvm.org/D42412
llvm-svn: 323409
diff --git a/llvm/lib/FuzzMutate/IRMutator.cpp b/llvm/lib/FuzzMutate/IRMutator.cpp
index 00b558a..2dc7dfb 100644
--- a/llvm/lib/FuzzMutate/IRMutator.cpp
+++ b/llvm/lib/FuzzMutate/IRMutator.cpp
@@ -152,10 +152,14 @@
void InstDeleterIRStrategy::mutate(Function &F, RandomIRBuilder &IB) {
auto RS = makeSampler<Instruction *>(IB.Rand);
- // Avoid terminators so we don't have to worry about keeping the CFG coherent.
- for (Instruction &Inst : instructions(F))
- if (!Inst.isTerminator())
- RS.sample(&Inst, /*Weight=*/1);
+ for (Instruction &Inst : instructions(F)) {
+ // TODO: We can't handle these instructions.
+ if (Inst.isTerminator() || Inst.isEHPad() ||
+ Inst.isSwiftError() || isa<PHINode>(Inst))
+ continue;
+
+ RS.sample(&Inst, /*Weight=*/1);
+ }
if (RS.isEmpty())
return;
@@ -191,4 +195,5 @@
RS.sample(IB.newSource(*BB, InstsBefore, {}, Pred), /*Weight=*/1);
Inst.replaceAllUsesWith(RS.getSelection());
+ Inst.eraseFromParent();
}
diff --git a/llvm/unittests/FuzzMutate/StrategiesTest.cpp b/llvm/unittests/FuzzMutate/StrategiesTest.cpp
index 4fcd456..320a4e9 100644
--- a/llvm/unittests/FuzzMutate/StrategiesTest.cpp
+++ b/llvm/unittests/FuzzMutate/StrategiesTest.cpp
@@ -64,6 +64,18 @@
return M;
}
+void IterateOnSource(StringRef Source, IRMutator &Mutator) {
+ LLVMContext Ctx;
+
+ for (int i = 0; i < 10; ++i) {
+ auto M = parseAssembly(Source.data(), Ctx);
+ ASSERT_TRUE(M && !verifyModule(*M, &errs()));
+
+ Mutator.mutateModule(*M, Seed, Source.size(), Source.size() + 100);
+ EXPECT_TRUE(!verifyModule(*M, &errs()));
+ }
+}
+
TEST(InjectorIRStrategyTest, EmptyModule) {
// Test that we can inject into empty module
@@ -81,7 +93,6 @@
TEST(InstDeleterIRStrategyTest, EmptyFunction) {
// Test that we don't crash even if we can't remove from one of the functions.
- LLVMContext Ctx;
StringRef Source = ""
"define <8 x i32> @func1() {\n"
"ret <8 x i32> undef\n"
@@ -96,15 +107,33 @@
auto Mutator = createDeleterMutator();
ASSERT_TRUE(Mutator);
- // We need to choose 'func1' in order for the crash to appear.
- // Loop 10 times and assume we are lucky.
- for (int i = 0; i < 10; ++i) {
- auto M = parseAssembly(Source.data(), Ctx);
- ASSERT_TRUE(M && !verifyModule(*M, &errs()));
+ IterateOnSource(Source, *Mutator);
+}
- Mutator->mutateModule(*M, Seed, Source.size(), Source.size() + 100);
- EXPECT_TRUE(!verifyModule(*M, &errs()));
- }
+TEST(InstDeleterIRStrategyTest, PhiNodes) {
+ // Test that inst deleter works correctly with the phi nodes.
+
+ LLVMContext Ctx;
+ StringRef Source = "\n\
+ define i32 @earlyreturncrash(i32 %x) {\n\
+ entry:\n\
+ switch i32 %x, label %sw.epilog [\n\
+ i32 1, label %sw.bb1\n\
+ ]\n\
+ \n\
+ sw.bb1:\n\
+ br label %sw.epilog\n\
+ \n\
+ sw.epilog:\n\
+ %a.0 = phi i32 [ 7, %entry ], [ 9, %sw.bb1 ]\n\
+ %b.0 = phi i32 [ 10, %entry ], [ 4, %sw.bb1 ]\n\
+ ret i32 %a.0\n\
+ }";
+
+ auto Mutator = createDeleterMutator();
+ ASSERT_TRUE(Mutator);
+
+ IterateOnSource(Source, *Mutator);
}
}