From: Chris Lattner Date: Fri, 28 Nov 2008 01:20:46 +0000 (+0000) Subject: rewrite RecursivelyDeleteTriviallyDeadInstructions to use a more efficient X-Git-Url: http://plrg.eecs.uci.edu/git/?a=commitdiff_plain;h=7605730ba8eaf248a8285bb2055e131f13c15b63;p=oota-llvm.git rewrite RecursivelyDeleteTriviallyDeadInstructions to use a more efficient formulation that doesn't require set lookups or scanning a set. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@60203 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Utils/Local.cpp b/lib/Transforms/Utils/Local.cpp index 17ae9719011..b8077aefb13 100644 --- a/lib/Transforms/Utils/Local.cpp +++ b/lib/Transforms/Utils/Local.cpp @@ -22,7 +22,6 @@ #include "llvm/Target/TargetData.h" #include "llvm/Support/GetElementPtrTypeIterator.h" #include "llvm/Support/MathExtras.h" -#include "llvm/ADT/SmallPtrSet.h" using namespace llvm; //===----------------------------------------------------------------------===// @@ -182,26 +181,37 @@ bool llvm::isInstructionTriviallyDead(Instruction *I) { void llvm::RecursivelyDeleteTriviallyDeadInstructions(Value *V, SmallVectorImpl *DeadInst) { Instruction *I = dyn_cast(V); - if (!I || !I->use_empty()) return; + if (!I || !I->use_empty() || !isInstructionTriviallyDead(I)) + return; - SmallPtrSet Insts; - Insts.insert(I); + SmallVector DeadInsts; + DeadInsts.push_back(I); - while (!Insts.empty()) { - I = *Insts.begin(); - Insts.erase(I); + while (!DeadInsts.empty()) { + I = DeadInsts.back(); + DeadInsts.pop_back(); - // Okay, if the instruction is dead, delete it. - if (!isInstructionTriviallyDead(I)) - continue; - - for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i) - if (Instruction *U = dyn_cast(I->getOperand(i))) - Insts.insert(U); - I->eraseFromParent(); - + // If the client wanted to know, tell it about deleted instructions. if (DeadInst) DeadInst->push_back(I); + + // Null out all of the instruction's operands to see if any operand becomes + // dead as we go. + for (unsigned i = 0, e = I->getNumOperands(); i != e; ++i) { + Value *OpV = I->getOperand(i); + I->setOperand(i, 0); + + if (!OpV->use_empty()) continue; + + // If the operand is an instruction that became dead as we nulled out the + // operand, and if it is 'trivially' dead, delete it in a future loop + // iteration. + if (Instruction *OpI = dyn_cast(OpV)) + if (isInstructionTriviallyDead(OpI)) + DeadInsts.push_back(OpI); + } + + I->eraseFromParent(); } }