diff options
| -rw-r--r-- | tools/bugpoint/CrashDebugger.cpp | 19 | ||||
| -rw-r--r-- | tools/bugpoint/ExtractFunction.cpp | 4 |
2 files changed, 12 insertions, 11 deletions
diff --git a/tools/bugpoint/CrashDebugger.cpp b/tools/bugpoint/CrashDebugger.cpp index d86d1c5..7dcbfe3 100644 --- a/tools/bugpoint/CrashDebugger.cpp +++ b/tools/bugpoint/CrashDebugger.cpp @@ -14,7 +14,7 @@ #include "BugDriver.h" #include "ToolRunner.h" #include "ListReducer.h" -#include "llvm/Constant.h" +#include "llvm/Constants.h" #include "llvm/DerivedTypes.h" #include "llvm/Instructions.h" #include "llvm/Module.h" @@ -300,17 +300,16 @@ bool ReduceCrashingBlocks::TestBlocks(std::vector<const BasicBlock*> &BBs) { 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())); + TerminatorInst *BBTerm = BB->getTerminator(); + + if (isa<StructType>(BBTerm->getType())) + BBTerm->replaceAllUsesWith(UndefValue::get(BBTerm->getType())); + else if (BB->getTerminator()->getType() != Type::VoidTy) + BBTerm->replaceAllUsesWith(Constant::getNullValue(BBTerm->getType())); - // Delete the old terminator instruction... + // Replace the old terminator instruction. BB->getInstList().pop_back(); - - // Add a new return instruction of the appropriate type... - const Type *RetTy = BB->getParent()->getReturnType(); - ReturnInst::Create(RetTy == Type::VoidTy ? 0 : - Constant::getNullValue(RetTy), BB); + new UnreachableInst(BB); } // The CFG Simplifier pass may delete one of the basic blocks we are diff --git a/tools/bugpoint/ExtractFunction.cpp b/tools/bugpoint/ExtractFunction.cpp index 906826e..ca8a279 100644 --- a/tools/bugpoint/ExtractFunction.cpp +++ b/tools/bugpoint/ExtractFunction.cpp @@ -71,7 +71,9 @@ Module *BugDriver::deleteInstructionFromProgram(const Instruction *I, Instruction *TheInst = RI; // Got the corresponding instruction! // If this instruction produces a value, replace any users with null values - if (TheInst->getType() != Type::VoidTy) + if (isa<StructType>(TheInst->getType())) + TheInst->replaceAllUsesWith(UndefValue::get(TheInst->getType())); + else if (TheInst->getType() != Type::VoidTy) TheInst->replaceAllUsesWith(Constant::getNullValue(TheInst->getType())); // Remove the instruction from the program. |