Pull iterators out of CFG.h and CFGdecls and put them in Support directory

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@664 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/Transforms/Scalar/ADCE.cpp b/lib/Transforms/Scalar/ADCE.cpp
index 631db2cea7..446b95afe0 100644
--- a/lib/Transforms/Scalar/ADCE.cpp
+++ b/lib/Transforms/Scalar/ADCE.cpp
@@ -11,8 +11,8 @@
 #include "llvm/Type.h"
 #include "llvm/Analysis/Dominators.h"
 #include "llvm/Support/STLExtras.h"
+#include "llvm/Support/DepthFirstIterator.h"
 #include "llvm/Analysis/Writer.h"
-#include "llvm/CFG.h"
 #include "llvm/iTerminators.h"
 #include <set>
 #include <algorithm>
@@ -90,7 +90,8 @@ bool ADCE::doADCE() {
   // instructions live in basic blocks that are unreachable.  These blocks will
   // be eliminated later, along with the instructions inside.
   //
-  for (cfg::df_iterator BBI = cfg::df_begin(M), BBE = cfg::df_end(M);
+  for (df_iterator<Method*> BBI = df_begin(M),
+                            BBE = df_end(M);
        BBI != BBE; ++BBI) {
     BasicBlock *BB = *BBI;
     for (BasicBlock::iterator II = BB->begin(), EI = BB->end(); II != EI; ) {