Fix batch of converting RegisterPass<> to INTIALIZE_PASS().

[oota-llvm.git] / lib / CodeGen / UnreachableBlockElim.cpp

diff --git a/lib/CodeGen/UnreachableBlockElim.cpp b/lib/CodeGen/UnreachableBlockElim.cpp
index c0d4494d5b950c3f81eb9892e5c160fd5804ecd5..be1fd23e2fccdf6904b6256fb2737b6f0e6b1d35 100644 (file)
--- a/lib/CodeGen/UnreachableBlockElim.cpp
+++ b/lib/CodeGen/UnreachableBlockElim.cpp
@@ -51,32 +51,20 @@ namespace {
   };
 }
 char UnreachableBlockElim::ID = 0;
-static RegisterPass<UnreachableBlockElim>
-X("unreachableblockelim", "Remove unreachable blocks from the CFG");
+INITIALIZE_PASS(UnreachableBlockElim, "unreachableblockelim",
+                "Remove unreachable blocks from the CFG", false, false);
 
 FunctionPass *llvm::createUnreachableBlockEliminationPass() {
   return new UnreachableBlockElim();
 }
 
-static void MarkReachableFrom(BasicBlock *BB, 
-                              SmallPtrSet<BasicBlock*, 8> &Reachable) {
-  for (df_ext_iterator<BasicBlock*, SmallPtrSet<BasicBlock*, 8> > I =
-       df_ext_begin(BB, Reachable), E = df_ext_end(BB, Reachable); I != E; ++I)
-    ; // Mark all reachable blocks.
-}
-
 bool UnreachableBlockElim::runOnFunction(Function &F) {
   SmallPtrSet<BasicBlock*, 8> Reachable;
 
   // Mark all reachable blocks.
-  MarkReachableFrom(&F.getEntryBlock(), Reachable);
-  
-  // Mark any address-taken blocks.  We don't want codegen to delete these
-  // because the address may already be referenced by another function and the
-  // label may be referenced.
-  for (Function::iterator I = F.begin(), E = F.end(); I != E; ++I)
-    if (I->hasAddressTaken() && !Reachable.count(I))
-      MarkReachableFrom(I, Reachable);
+  for (df_ext_iterator<Function*, SmallPtrSet<BasicBlock*, 8> > I =
+       df_ext_begin(&F, Reachable), E = df_ext_end(&F, Reachable); I != E; ++I)
+    /* Mark all reachable blocks */;
 
   // Loop over all dead blocks, remembering them and deleting all instructions
   // in them.