Method.h no longer includes BasicBlock.h

Method::inst_* is now in llvm/Support/InstIterator.h
GraphTraits specializations for BasicBlock and Methods are now in llvm/Support/CFG.h


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

4 files changed, 6 insertions, 4 deletions

diff --git a/tools/analyze/analyze.cpp b/tools/analyze/analyze.cpp
index 112bfcc..5f3e52e 100644
--- a/tools/analyze/analyze.cpp
+++ b/tools/analyze/analyze.cpp
@@ -28,6 +28,7 @@
 #include "llvm/Analysis/LoopInfo.h"
 #include "llvm/Analysis/FindUnsafePointerTypes.h"
 #include "llvm/Analysis/FindUsedTypes.h"
+#include "llvm/Support/InstIterator.h"
 #include "Support/CommandLine.h"
 #include <algorithm>
 #include <iostream>
@@ -119,8 +120,7 @@ struct InstForest : public MethodPass {
 struct IndVars : public MethodPass {
   void doit(Method *M) {
     cfg::LoopInfo &LI = getAnalysis<cfg::LoopInfo>();
-    for (Method::inst_iterator I = M->inst_begin(), E = M->inst_end();
-         I != E; ++I)
+    for (inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I)
       if (PHINode *PN = dyn_cast<PHINode>(*I)) {
         InductionVariable IV(PN, &LI);
         if (IV.InductionType != InductionVariable::Unknown)
@@ -137,8 +137,7 @@ struct IndVars : public MethodPass {
 struct Exprs : public MethodPass {
   static void doit(Method *M) {
     cout << "Classified expressions for: " << M->getName() << "\n";
-    Method::inst_iterator I = M->inst_begin(), E = M->inst_end();
-    for (; I != E; ++I) {
+    for (inst_iterator I = inst_begin(M), E = inst_end(M); I != E; ++I) {
       cout << *I;
       
       if ((*I)->getType() == Type::VoidTy) continue;
diff --git a/tools/dis/dis.cpp b/tools/dis/dis.cpp
index 11e67c4..3495465 100644
--- a/tools/dis/dis.cpp
+++ b/tools/dis/dis.cpp
@@ -20,6 +20,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Method.h"
+#include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"
 #include "Support/CommandLine.h"
diff --git a/tools/llvm-dis/dis.cpp b/tools/llvm-dis/dis.cpp
index 11e67c4..3495465 100644
--- a/tools/llvm-dis/dis.cpp
+++ b/tools/llvm-dis/dis.cpp
@@ -20,6 +20,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Method.h"
+#include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"
 #include "Support/CommandLine.h"
diff --git a/tools/llvm-dis/llvm-dis.cpp b/tools/llvm-dis/llvm-dis.cpp
index 11e67c4..3495465 100644
--- a/tools/llvm-dis/llvm-dis.cpp
+++ b/tools/llvm-dis/llvm-dis.cpp
@@ -20,6 +20,7 @@
 #include "llvm/Assembly/Writer.h"
 #include "llvm/Bytecode/Reader.h"
 #include "llvm/Method.h"
+#include "llvm/Support/CFG.h"
 #include "Support/DepthFirstIterator.h"
 #include "Support/PostOrderIterator.h"
 #include "Support/CommandLine.h"