mirror of
https://github.com/RPCS3/llvm.git
synced 2024-12-14 15:39:06 +00:00
several multiple-retval fixes for bugpoint.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@50331 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
f899fce0c0
commit
e78109eb3a
@ -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
|
||||
|
@ -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.
|
||||
|
Loading…
Reference in New Issue
Block a user