Rename DeleteBlockIfDead to DeleteDeadBlock and make it

unconditionally delete the block.  All likely clients will
do the checking anyway.

llvm-svn: 60464
This commit is contained in:
Chris Lattner 2008-12-03 06:40:52 +00:00
parent 12c3938837
commit 7a00825f57
3 changed files with 8 additions and 14 deletions

View File

@ -26,10 +26,9 @@ class Instruction;
class Pass;
class AliasAnalysis;
/// DeleteBlockIfDead - If the specified basic block is trivially dead (has no
/// predecessors and not the entry block), delete it and return true. Otherwise
/// return false.
bool DeleteBlockIfDead(BasicBlock *BB);
/// DeleteDeadBlock - Delete the specified block, which must have no
/// predecessors.
void DeleteDeadBlock(BasicBlock *BB);
/// MergeBlockIntoPredecessor - Attempts to merge a block into its predecessor,
/// if possible. The return value indicates success or failure.

View File

@ -24,14 +24,10 @@
#include <algorithm>
using namespace llvm;
/// DeleteBlockIfDead - If the specified basic block is trivially dead (has no
/// predecessors and not the entry block), delete it and return true. Otherwise
/// return false.
bool llvm::DeleteBlockIfDead(BasicBlock *BB) {
if (pred_begin(BB) != pred_end(BB) ||
BB == &BB->getParent()->getEntryBlock())
return false;
/// DeleteDeadBlock - Delete the specified block, which must have no
/// predecessors.
void llvm::DeleteDeadBlock(BasicBlock *BB) {
assert(pred_begin(BB) != pred_end(BB) && "Block is not dead!");
TerminatorInst *BBTerm = BB->getTerminator();
// Loop through all of our successors and make sure they know that one
@ -54,7 +50,6 @@ bool llvm::DeleteBlockIfDead(BasicBlock *BB) {
// Zap the block!
BB->eraseFromParent();
return true;
}
/// MergeBlockIntoPredecessor - Attempts to merge a block into its predecessor,

View File

@ -1681,7 +1681,7 @@ bool llvm::SimplifyCFG(BasicBlock *BB) {
// as a predecessor. These are unreachable.
if (pred_begin(BB) == pred_end(BB) || BB->getSinglePredecessor() == BB) {
DOUT << "Removing BB: \n" << *BB;
DeleteBlockIfDead(BB);
DeleteDeadBlock(BB);
return true;
}