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

llvm-svn: 85717

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 {
 

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();

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;

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"

lib/Analysis/IPA/CallGraph.cpp

@@ -13,7 +13,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "llvm/Analysis/CallGraph.h"
-#include "llvm/Pass.h"
 #include "llvm/Module.h"
 #include "llvm/Instructions.h"
 #include "llvm/IntrinsicInst.h"

lib/Analysis/ScalarEvolution.cpp

@@ -5151,8 +5151,6 @@ ScalarEvolution::SCEVCallbackVH::SCEVCallbackVH(Value *V, ScalarEvolution *se)
 //                   ScalarEvolution Class Implementation
 //===----------------------------------------------------------------------===//
 
-FunctionPass *createScalarEvolutionPass() { return new ScalarEvolution(); }
-
 ScalarEvolution::ScalarEvolution()
   : FunctionPass(&ID) {
 }

lib/Transforms/IPO/IPO.cpp

@@ -14,7 +14,6 @@
 
 #include "llvm-c/Transforms/IPO.h"
 #include "llvm/PassManager.h"
-#include "llvm/Pass.h"
 #include "llvm/Transforms/IPO.h"
 
 using namespace llvm;

tools/llvm-prof/llvm-prof.cpp

@@ -17,7 +17,6 @@
 #include "llvm/LLVMContext.h"
 #include "llvm/Module.h"
 #include "llvm/PassManager.h"
-#include "llvm/Pass.h"
 #include "llvm/Assembly/AsmAnnotationWriter.h"
 #include "llvm/Analysis/ProfileInfo.h"
 #include "llvm/Analysis/ProfileInfoLoader.h"