simplify and cleanup some code, remove some code that just

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

diff --git a/lib/Transforms/Scalar/DCE.cpp b/lib/Transforms/Scalar/DCE.cpp
index a4a1104e92428ca5d877e4f9dd8d596a9a1e3932..8bb504c09c6e3ca483f74d8c5d0bfbe1c7838f68 100644 (file)
--- a/lib/Transforms/Scalar/DCE.cpp
+++ b/lib/Transforms/Scalar/DCE.cpp
@@ -2,8 +2,8 @@
 //
 //                     The LLVM Compiler Infrastructure
 //
-// This file was developed by the LLVM research group and is distributed under
-// the University of Illinois Open Source License. See LICENSE.TXT for details.
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 //
@@ -16,32 +16,37 @@
 //
 //===----------------------------------------------------------------------===//
 
+#define DEBUG_TYPE "dce"
 #include "llvm/Transforms/Scalar.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 <set>
 using namespace llvm;
 
-namespace {
-  Statistic<> DIEEliminated("die", "Number of insts removed");
-  Statistic<> DCEEliminated("dce", "Number of insts removed");
+STATISTIC(DIEEliminated, "Number of insts removed by DIE pass");
+STATISTIC(DCEEliminated, "Number of insts removed");
 
+namespace {
   //===--------------------------------------------------------------------===//
   // DeadInstElimination pass implementation
   //
-
-  struct DeadInstElimination : public BasicBlockPass {
+  struct VISIBILITY_HIDDEN DeadInstElimination : public BasicBlockPass {
+    static char ID; // Pass identification, replacement for typeid
+    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;
     }
 
@@ -49,31 +54,36 @@ namespace {
       AU.setPreservesCFG();
     }
   };
-
-  RegisterPass<DeadInstElimination> X("die", "Dead Instruction Elimination");
 }
 
-FunctionPass *llvm::createDeadInstEliminationPass() {
+char DeadInstElimination::ID = 0;
+static RegisterPass<DeadInstElimination>
+X("die", "Dead Instruction Elimination");
+
+Pass *llvm::createDeadInstEliminationPass() {
   return new DeadInstElimination();
 }
 
 
-//===----------------------------------------------------------------------===//
-// DeadCodeElimination pass implementation
-//
-
 namespace {
+  //===--------------------------------------------------------------------===//
+  // DeadCodeElimination pass implementation
+  //
   struct DCE : public FunctionPass {
+    static char ID; // Pass identification, replacement for typeid
+    DCE() : FunctionPass(&ID) {}
+
     virtual bool runOnFunction(Function &F);
 
      virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.setPreservesCFG();
     }
  };
-
-  RegisterPass<DCE> Y("dce", "Dead Code Elimination");
 }
 
+char DCE::ID = 0;
+static RegisterPass<DCE> Y("dce", "Dead Code Elimination");
+
 bool DCE::runOnFunction(Function &F) {
   // Start out with all of the instructions in the worklist...
   std::vector<Instruction*> WorkList;
@@ -102,13 +112,13 @@ bool DCE::runOnFunction(Function &F) {
       I->eraseFromParent();
 
       // Remove the instruction from the worklist if it still exists in it.
-      for (std::vector<Instruction*>::iterator WI = WorkList.begin(),
-             E = WorkList.end(); WI != E; ++WI)
-        if (*WI == I) {
-          WorkList.erase(WI);
-          --E;
-          --WI;
-        }
+      for (std::vector<Instruction*>::iterator WI = WorkList.begin();
+           WI != WorkList.end(); ) {
+        if (*WI == I)
+          WI = WorkList.erase(WI);
+        else
+          ++WI;
+      }
 
       MadeChange = true;
       ++DCEEliminated;