Add missing newlines at EOF (for clang++).

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

diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp
index 5c3b833452b5a911a932e32cd75f7ee0e38626c2..37f383fb512ad0b6923b51ac5b5d00cf33c9b022 100644 (file)
--- a/lib/Transforms/Scalar/ADCE.cpp
+++ b/lib/Transforms/Scalar/ADCE.cpp
@@ -16,21 +16,24 @@
 
 #define DEBUG_TYPE "adce"
 #include "llvm/Transforms/Scalar.h"
+#include "llvm/BasicBlock.h"
 #include "llvm/Instructions.h"
+#include "llvm/IntrinsicInst.h"
 #include "llvm/Pass.h"
-#include "llvm/Support/Compiler.h"
+#include "llvm/Support/CFG.h"
 #include "llvm/Support/InstIterator.h"
-#include "llvm/ADT/Statistic.h"
+#include "llvm/ADT/DepthFirstIterator.h"
 #include "llvm/ADT/SmallPtrSet.h"
-
+#include "llvm/ADT/SmallVector.h"
+#include "llvm/ADT/Statistic.h"
 using namespace llvm;
 
 STATISTIC(NumRemoved, "Number of instructions removed");
 
 namespace {
-  struct VISIBILITY_HIDDEN ADCE : public FunctionPass {
+  struct ADCE : public FunctionPass {
     static char ID; // Pass identification, replacement for typeid
-    ADCE() : FunctionPass((intptr_t)&ID) {}
+    ADCE() : FunctionPass(&ID) {}
     
     virtual bool runOnFunction(Function& F);
     
@@ -45,13 +48,14 @@ char ADCE::ID = 0;
 static RegisterPass<ADCE> X("adce", "Aggressive Dead Code Elimination");
 
 bool ADCE::runOnFunction(Function& F) {
-  SmallPtrSet<Instruction*, 32> alive;
-  std::vector<Instruction*> worklist;
+  SmallPtrSet<Instruction*, 128> alive;
+  SmallVector<Instruction*, 128> worklist;
   
   // Collect the set of "root" instructions that are known live.
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
     if (isa<TerminatorInst>(I.getInstructionIterator()) ||
-        I->mayWriteToMemory()) {
+        isa<DbgInfoIntrinsic>(I.getInstructionIterator()) ||
+        I->mayHaveSideEffects()) {
       alive.insert(I.getInstructionIterator());
       worklist.push_back(I.getInstructionIterator());
     }
@@ -71,22 +75,22 @@ bool ADCE::runOnFunction(Function& F) {
   // The inverse of the live set is the dead set.  These are those instructions
   // which have no side effects and do not influence the control flow or return
   // value of the function, and may therefore be deleted safely.
-  SmallPtrSet<Instruction*, 32> dead;
+  // NOTE: We reuse the worklist vector here for memory efficiency.
   for (inst_iterator I = inst_begin(F), E = inst_end(F); I != E; ++I)
     if (!alive.count(I.getInstructionIterator())) {
-      dead.insert(I.getInstructionIterator());
+      worklist.push_back(I.getInstructionIterator());
       I->dropAllReferences();
     }
   
-  for (SmallPtrSet<Instruction*, 32>::iterator I = dead.begin(),
-       E = dead.end(); I != E; ++I) {
+  for (SmallVector<Instruction*, 1024>::iterator I = worklist.begin(),
+       E = worklist.end(); I != E; ++I) {
     NumRemoved++;
     (*I)->eraseFromParent();
   }
-    
-  return !dead.empty();
+
+  return !worklist.empty();
 }
 
 FunctionPass *llvm::createAggressiveDCEPass() {
   return new ADCE();
-}
\ No newline at end of file
+}