Finish LLVMContext-ing lib/Analysis. This required pushing LLVMContext's through...

[oota-llvm.git] / lib / Transforms / Scalar / DCE.cpp

diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp
index fb9a0e04fd6243a9380f2d2f0f902cbb8790854a..8bb504c09c6e3ca483f74d8c5d0bfbe1c7838f68 100644 (file)
--- a/lib/Transforms/Scalar/DCE.cpp
+++ b/lib/Transforms/Scalar/DCE.cpp
@@ -36,15 +36,17 @@ namespace {
   //
   struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass {
     static char ID; // Pass identification, replacement for typeid
-    DeadInstElimination() : BasicBlockPass(intptr_t(&ID)) {}
+    DeadInstElimination() : BasicBlockPass(&ID) {}
     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;
-        } else
-          ++DI;
+        }
+      }
       return Changed;
     }