improve optimization of invoke instructions:
- simplifycfg: invoke undef/null -> unreachable
- instcombine: invoke new -> invoke expect(0, 0) (an arbitrary NOOP intrinsic; only done if the allocated memory is unused, of course)
- verifier: allow invoke of intrinsics (to make the previous step work)
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@159146 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/InstCombine/InstructionCombining.cpp b/lib/Transforms/InstCombine/InstructionCombining.cpp
index 269ea15..07793ac 100644
--- a/lib/Transforms/InstCombine/InstructionCombining.cpp
+++ b/lib/Transforms/InstCombine/InstructionCombining.cpp
@@ -1169,7 +1169,14 @@
}
if (InvokeInst *II = dyn_cast<InvokeInst>(&MI)) {
- BranchInst::Create(II->getNormalDest(), II->getParent());
+ // Replace invoke with a NOOP intrinsic to maintain the original CFG
+ Module *M = II->getParent()->getParent()->getParent();
+ IntegerType *Ty = IntegerType::get(II->getContext(), 8);
+ ConstantInt *CI = ConstantInt::get(Ty, 0);
+ Value *Args[] = {CI, CI};
+ Function *F = Intrinsic::getDeclaration(M, Intrinsic::expect, Ty);
+ InvokeInst::Create(F, II->getNormalDest(), II->getUnwindDest(), Args,
+ "dummy", II->getParent());
}
return EraseInstFromFunction(MI);
}