* Pull BasicBlock::pred_* and BasicBlock::succ_* out of BasicBlock.h and into

  llvm/Support/CFG.h
* Make pred & succ iterators for intervals global functions
* Add #includes that are now neccesary because BasicBlock.h doesn't include
  InstrTypes.h anymore


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

1 files changed, 3 insertions, 2 deletions

diff --git a/lib/Transforms/IPO/DeadTypeElimination.cpp b/lib/Transforms/IPO/DeadTypeElimination.cpp
index 297eaddfba..7ec2b6faa8 100644
--- a/lib/Transforms/IPO/DeadTypeElimination.cpp
+++ b/lib/Transforms/IPO/DeadTypeElimination.cpp
@@ -22,6 +22,7 @@
 #include "llvm/iMemory.h"
 #include "llvm/iTerminators.h"
 #include "llvm/iOther.h"
+#include "llvm/Support/CFG.h"
 #include <algorithm>
 #include <iostream>
 using std::vector;
@@ -355,7 +356,7 @@ static inline bool FixCastsAndPHIs(BasicBlock *BB) {
 //
 static inline void RefactorPredecessor(BasicBlock *BB, BasicBlock *Pred) {
   Method *M = BB->getParent();
-  assert(find(BB->pred_begin(), BB->pred_end(), Pred) != BB->pred_end() &&
+  assert(find(pred_begin(BB), pred_end(BB), Pred) != pred_end(BB) &&
          "Pred is not a predecessor of BB!");
 
   // Create a new basic block, adding it to the end of the method.
@@ -448,7 +449,7 @@ static bool fixLocalProblems(Method *M) {
     Changed |= FixCastsAndPHIs(BB);
 
     if (isa<PHINode>(BB->front())) {
-      const vector<BasicBlock*> Preds(BB->pred_begin(), BB->pred_end());
+      const vector<BasicBlock*> Preds(pred_begin(BB), pred_end(BB));
 
       // Handle Problem #1.  Sort the list of predecessors so that it is easy to
       // decide whether or not duplicate predecessors exist.