From 8bc098be0cce48dcc08fea746d28011cac79eef6 Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Sat, 22 Nov 2003 02:10:38 +0000 Subject: [PATCH] Do not crash when dealing with invoke and unwind instructions! git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@10160 91177308-0d34-0410-b5e6-96231b3b80d8 --- tools/bugpoint/CrashDebugger.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index 8c29ea226a4..af64d7a9af6 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -195,20 +195,23 @@ bool ReduceCrashingBlocks::TestBlocks(std::vector &BBs) { // Loop over and delete any hack up any blocks that are not listed... for (Module::iterator I = M->begin(), E = M->end(); I != E; ++I) for (Function::iterator BB = I->begin(), E = I->end(); BB != E; ++BB) - if (!Blocks.count(BB) && !isa(BB->getTerminator())) { + if (!Blocks.count(BB) && BB->getTerminator()->getNumSuccessors()) { // Loop over all of the successors of this block, deleting any PHI nodes // that might include it. for (succ_iterator SI = succ_begin(BB), E = succ_end(BB); SI != E; ++SI) (*SI)->removePredecessor(BB); + if (BB->getTerminator()->getType() != Type::VoidTy) + BB->getTerminator()->replaceAllUsesWith( + Constant::getNullValue(BB->getTerminator()->getType())); + // Delete the old terminator instruction... BB->getInstList().pop_back(); // Add a new return instruction of the appropriate type... const Type *RetTy = BB->getParent()->getReturnType(); - ReturnInst *RI = new ReturnInst(RetTy == Type::VoidTy ? 0 : - Constant::getNullValue(RetTy)); - BB->getInstList().push_back(RI); + new ReturnInst(RetTy == Type::VoidTy ? 0 : + Constant::getNullValue(RetTy), BB); } // The CFG Simplifier pass may delete one of the basic blocks we are -- 2.34.1