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

diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index cd17717909c53563977a5e59639fa7142690bc21..287fe4faa4f560a397c7637079ec0c72cfb5fb21 100644 (file)
--- 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 b7c5d55e82f7aedc4bc1751112662a8c9d4faeb8..66ab3ea5caf1f362676e4c5a60443b6348797efb 100644 (file)
--- 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 c767f2513353d589fe3385c2eb6387fb85d3e71a..a6703fd5867a88457d4a91b8dc67e22ec6126903 100644 (file)
--- 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 120ac84bd78cf319d36b99597209b8fbc5138b83..5a8f55570a822034e37d0b7d1440b0802c4b1d42 100644 (file)
--- 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"

diff --git a/lib/Analysis/IPA/CallGraph.cpp b/lib/Analysis/IPA/CallGraph.cpp
index ac83e4866811396c14324341384bc06975e998eb..9cd8bb8c2df1b9d38be8ddce72ad6d3d83a3eb4e 100644 (file)
--- a/lib/Analysis/IPA/CallGraph.cpp
+++ b/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"

diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index e330c8da5a984e705837402340ea460a3a4615df..3e87ca22be325607c86ce12077823d2ba8aff488 100644 (file)
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/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) {
 }

diff --git a/lib/Transforms/IPO/IPO.cpp b/lib/Transforms/IPO/IPO.cpp
index c3f0d7b5a140f9ca1d1d357e3ed3ea6f31d2dcfe..83e8624fe09df2ea624423195160873f928453f6 100644 (file)
--- a/lib/Transforms/IPO/IPO.cpp
+++ b/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;

diff --git a/tools/llvm-prof/llvm-prof.cpp b/tools/llvm-prof/llvm-prof.cpp
index 9b728f7e9264cb9e0ab9423b037347228df23946..88adeb43e6de35390d500cef99c5e8d58786a563 100644 (file)
--- a/tools/llvm-prof/llvm-prof.cpp
+++ b/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"