projects
/
oota-llvm.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
svn mv Target/ARM/ARMGlobalMerge.cpp Transforms/Scalar/GlobalMerge.cpp
[oota-llvm.git]
/
lib
/
Transforms
/
Scalar
/
DCE.cpp
diff --git
a/lib/Transforms/Scalar/DCE.cpp
b/lib/Transforms/Scalar/DCE.cpp
index 539dd22d47d102b54de8e61995a71e5125c91571..8dbcc23d7ec85677a75d2863323f85488f08bb41 100644
(file)
--- a/
lib/Transforms/Scalar/DCE.cpp
+++ b/
lib/Transforms/Scalar/DCE.cpp
@@
-21,10
+21,8
@@
#include "llvm/Transforms/Utils/Local.h"
#include "llvm/Instruction.h"
#include "llvm/Pass.h"
#include "llvm/Transforms/Utils/Local.h"
#include "llvm/Instruction.h"
#include "llvm/Pass.h"
-#include "llvm/Support/Compiler.h"
#include "llvm/Support/InstIterator.h"
#include "llvm/ADT/Statistic.h"
#include "llvm/Support/InstIterator.h"
#include "llvm/ADT/Statistic.h"
-#include <set>
using namespace llvm;
STATISTIC(DIEEliminated, "Number of insts removed by DIE pass");
using namespace llvm;
STATISTIC(DIEEliminated, "Number of insts removed by DIE pass");
@@
-34,17
+32,21
@@
namespace {
//===--------------------------------------------------------------------===//
// DeadInstElimination pass implementation
//
//===--------------------------------------------------------------------===//
// DeadInstElimination pass implementation
//
- struct
VISIBILITY_HIDDEN
DeadInstElimination : public BasicBlockPass {
+ struct DeadInstElimination : public BasicBlockPass {
static char ID; // Pass identification, replacement for typeid
static char ID; // Pass identification, replacement for typeid
- DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {}
+ DeadInstElimination() : BasicBlockPass(ID) {
+ initializeDeadInstEliminationPass(*PassRegistry::getPassRegistry());
+ }
virtual bool runOnBasicBlock(BasicBlock &BB) {
bool Changed = false;
virtual bool runOnBasicBlock(BasicBlock &BB) {
bool Changed = false;
- for (BasicBlock::iterator DI = BB.begin(); DI != BB.end(); )
- if (dceInstruction(DI)) {
+ for (BasicBlock::iterator DI = BB.begin(); DI != BB.end(); ) {
+ Instruction *Inst = DI++;
+ if (isInstructionTriviallyDead(Inst)) {
+ Inst->eraseFromParent();
Changed = true;
++DIEEliminated;
Changed = true;
++DIEEliminated;
- }
else
- ++DI;
+ }
+ }
return Changed;
}
return Changed;
}
@@
-52,11
+54,12
@@
namespace {
AU.setPreservesCFG();
}
};
AU.setPreservesCFG();
}
};
-
- char DeadInstElimination::ID = 0;
- RegisterPass<DeadInstElimination> X("die", "Dead Instruction Elimination");
}
}
+char DeadInstElimination::ID = 0;
+INITIALIZE_PASS(DeadInstElimination, "die",
+ "Dead Instruction Elimination", false, false)
+
Pass *llvm::createDeadInstEliminationPass() {
return new DeadInstElimination();
}
Pass *llvm::createDeadInstEliminationPass() {
return new DeadInstElimination();
}
@@
-68,7
+71,9
@@
namespace {
//
struct DCE : public FunctionPass {
static char ID; // Pass identification, replacement for typeid
//
struct DCE : public FunctionPass {
static char ID; // Pass identification, replacement for typeid
- DCE() : FunctionPass((intptr_t)&ID) {}
+ DCE() : FunctionPass(ID) {
+ initializeDCEPass(*PassRegistry::getPassRegistry());
+ }
virtual bool runOnFunction(Function &F);
virtual bool runOnFunction(Function &F);
@@
-76,11
+81,11
@@
namespace {
AU.setPreservesCFG();
}
};
AU.setPreservesCFG();
}
};
-
- char DCE::ID = 0;
- RegisterPass<DCE> Y("dce", "Dead Code Elimination");
}
}
+char DCE::ID = 0;
+INITIALIZE_PASS(DCE, "dce", "Dead Code Elimination", false, false)
+
bool DCE::runOnFunction(Function &F) {
// Start out with all of the instructions in the worklist...
std::vector<Instruction*> WorkList;
bool DCE::runOnFunction(Function &F) {
// Start out with all of the instructions in the worklist...
std::vector<Instruction*> WorkList;
@@
-110,11
+115,12
@@
bool DCE::runOnFunction(Function &F) {
// Remove the instruction from the worklist if it still exists in it.
for (std::vector<Instruction*>::iterator WI = WorkList.begin();
// Remove the instruction from the worklist if it still exists in it.
for (std::vector<Instruction*>::iterator WI = WorkList.begin();
- WI != WorkList.end();
++WI)
- if (*WI == I)
{
+ WI != WorkList.end();
) {
+ if (*WI == I)
WI = WorkList.erase(WI);
WI = WorkList.erase(WI);
- --WI;
- }
+ else
+ ++WI;
+ }
MadeChange = true;
++DCEEliminated;
MadeChange = true;
++DCEEliminated;