RPCS3/llvm-mirror
1
0
Fork 0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2025-04-03 16:21:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[SCCP] Remove duplicate code

Browse Source 
SCCP has code identical to changeToUnreachable's behavior, switch it
over to just call changeToUnreachable.

No functionality change intended.

llvm-svn: 258654
This commit is contained in:
David Majnemer 2016-01-24 06:26:47 +00:00
parent 0fce247968
commit bfc3671cd7
3 changed files with 16 additions and 22 deletions
include/llvm/Transforms/Utils
Local.h
lib/Transforms
Scalar
SCCP.cpp
Utils
Local.cpp

2
include/llvm/Transforms/Utils/Local.h

@ -295,7 +295,7 @@ unsigned removeAllNonTerminatorAndEHPadInstructions(BasicBlock *BB);
/// \brief Insert an unreachable instruction before the specified /// \brief Insert an unreachable instruction before the specified
/// instruction, making it and the rest of the code in the block dead. /// instruction, making it and the rest of the code in the block dead.
void changeToUnreachable(Instruction *I, bool UseLLVMTrap); unsigned changeToUnreachable(Instruction *I, bool UseLLVMTrap);
/// Replace 'BB's terminator with one that does not have an unwind successor /// Replace 'BB's terminator with one that does not have an unwind successor
/// block. Rewrites `invoke` to `call`, etc. Updates any PHIs in unwind /// block. Rewrites `invoke` to `call`, etc. Updates any PHIs in unwind

31
lib/Transforms/Scalar/SCCP.cpp

@ -1564,14 +1564,6 @@ FunctionPass *llvm::createSCCPPass() {
return new SCCP(); return new SCCP();
} }
static void DeleteInstructionInBlock(BasicBlock *BB) {
DEBUG(dbgs() << " BasicBlock Dead:" << *BB);
++NumDeadBlocks;
unsigned NumRemovedInBB = removeAllNonTerminatorAndEHPadInstructions(BB);
NumInstRemoved += NumRemovedInBB;
}
// runOnFunction() - Run the Sparse Conditional Constant Propagation algorithm, // runOnFunction() - Run the Sparse Conditional Constant Propagation algorithm,
// and return true if the function was modified. // and return true if the function was modified.
// //
@ -1608,7 +1600,11 @@ bool SCCP::runOnFunction(Function &F) {
for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) { for (Function::iterator BB = F.begin(), E = F.end(); BB != E; ++BB) {
if (!Solver.isBlockExecutable(&*BB)) { if (!Solver.isBlockExecutable(&*BB)) {
DeleteInstructionInBlock(&*BB); DEBUG(dbgs() << " BasicBlock Dead:" << *BB);
++NumDeadBlocks;
NumInstRemoved += removeAllNonTerminatorAndEHPadInstructions(BB);
MadeChanges = true; MadeChanges = true;
continue; continue;
} }
@ -1806,18 +1802,13 @@ bool IPSCCP::runOnModule(Module &M) {
for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) { for (Function::iterator BB = F->begin(), E = F->end(); BB != E; ++BB) {
if (!Solver.isBlockExecutable(&*BB)) { if (!Solver.isBlockExecutable(&*BB)) {
DeleteInstructionInBlock(&*BB); DEBUG(dbgs() << " BasicBlock Dead:" << *BB);
MadeChanges = true;
TerminatorInst *TI = BB->getTerminator(); ++NumDeadBlocks;
for (BasicBlock *Succ : TI->successors()) { NumInstRemoved +=
if (!Succ->empty() && isa<PHINode>(Succ->begin())) changeToUnreachable(&*BB->begin(), /*UseLLVMTrap=*/false);
Succ->removePredecessor(&*BB);
} MadeChanges = true;
if (!TI->use_empty())
TI->replaceAllUsesWith(UndefValue::get(TI->getType()));
TI->eraseFromParent();
new UnreachableInst(M.getContext(), &*BB);
if (&*BB != &F->front()) if (&*BB != &F->front())
BlocksToErase.push_back(&*BB); BlocksToErase.push_back(&*BB);

5
lib/Transforms/Utils/Local.cpp

@ -1243,7 +1243,7 @@ unsigned llvm::removeAllNonTerminatorAndEHPadInstructions(BasicBlock *BB) {
return NumDeadInst; return NumDeadInst;
} }
void llvm::changeToUnreachable(Instruction *I, bool UseLLVMTrap) { unsigned llvm::changeToUnreachable(Instruction *I, bool UseLLVMTrap) {
BasicBlock *BB = I->getParent(); BasicBlock *BB = I->getParent();
// Loop over all of the successors, removing BB's entry from any PHI // Loop over all of the successors, removing BB's entry from any PHI
// nodes. // nodes.
@ -1261,12 +1261,15 @@ void llvm::changeToUnreachable(Instruction *I, bool UseLLVMTrap) {
new UnreachableInst(I->getContext(), I); new UnreachableInst(I->getContext(), I);
// All instructions after this are dead. // All instructions after this are dead.
unsigned NumInstrsRemoved = 0;
BasicBlock::iterator BBI = I->getIterator(), BBE = BB->end(); BasicBlock::iterator BBI = I->getIterator(), BBE = BB->end();
while (BBI != BBE) { while (BBI != BBE) {
if (!BBI->use_empty()) if (!BBI->use_empty())
BBI->replaceAllUsesWith(UndefValue::get(BBI->getType())); BBI->replaceAllUsesWith(UndefValue::get(BBI->getType()));
BB->getInstList().erase(BBI++); BB->getInstList().erase(BBI++);
++NumInstrsRemoved;
} }
return NumInstrsRemoved;
} }
/// changeToCall - Convert the specified invoke into a normal call. /// changeToCall - Convert the specified invoke into a normal call.