Reverting 85714, 85715, 85716, which are breaking the build

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

4 files changed, 3 insertions, 10 deletions

diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index cd17717..287fe4f 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -52,13 +52,13 @@
 #define LLVM_ANALYSIS_CALLGRAPH_H
 
 #include "llvm/Function.h"
+#include "llvm/Pass.h"
 #include "llvm/ADT/GraphTraits.h"
 #include "llvm/ADT/STLExtras.h"
 #include "llvm/Support/CallSite.h"
 #include "llvm/Support/ValueHandle.h"
 #include "llvm/System/IncludeFile.h"
 #include <map>
-#include <vector>
 
 namespace llvm {
 
diff --git a/include/llvm/Analysis/Passes.h b/include/llvm/Analysis/Passes.h
index b7c5d55..66ab3ea 100644
--- a/include/llvm/Analysis/Passes.h
+++ b/include/llvm/Analysis/Passes.h
@@ -147,13 +147,6 @@ namespace llvm {
   //
   LoopPass *createLoopDependenceAnalysisPass();
   
-  //===--------------------------------------------------------------------===//
-  //
-  // createScalarEvolutionPass - This creates an instance of the
-  // ScalarEvolution pass.
-  //
-  FunctionPass *createScalarEvolutionPass();
-  
   // Minor pass prototypes, allowing us to expose them through bugpoint and
   // analyze.
   FunctionPass *createInstCountPass();
diff --git a/include/llvm/PassManager.h b/include/llvm/PassManager.h
index c767f25..a6703fd 100644
--- a/include/llvm/PassManager.h
+++ b/include/llvm/PassManager.h
@@ -17,9 +17,10 @@
 #ifndef LLVM_PASSMANAGER_H
 #define LLVM_PASSMANAGER_H
 
+#include "llvm/Pass.h"
+
 namespace llvm {
 
-class Function;
 class Pass;
 class ModulePass;
 class Module;
diff --git a/include/llvm/PassManagers.h b/include/llvm/PassManagers.h
index 120ac84..5a8f555 100644
--- a/include/llvm/PassManagers.h
+++ b/include/llvm/PassManagers.h
@@ -14,7 +14,6 @@
 #ifndef LLVM_PASSMANAGERS_H
 #define LLVM_PASSMANAGERS_H
 
-#include "llvm/Pass.h"
 #include "llvm/PassManager.h"
 #include "llvm/ADT/SmallVector.h"
 #include "llvm/ADT/SmallPtrSet.h"