15 files changed, 22 insertions, 22 deletions
diff --git a/lib/Analysis/CFGPrinter.cpp b/lib/Analysis/CFGPrinter.cpp
index 693c1f6d8c..a762a8e5f8 100644
--- a/lib/Analysis/CFGPrinter.cpp
+++ b/lib/Analysis/CFGPrinter.cpp
@@ -109,8 +109,8 @@ namespace {
     }
   };
 
-  RegisterAnalysis<CFGPrinter> P1("print-cfg",
-                                  "Print CFG of function to 'dot' file");
+  RegisterPass<CFGPrinter> P1("print-cfg",
+                              "Print CFG of function to 'dot' file");
 
   struct CFGOnlyPrinter : public CFGPrinter {
     virtual bool runOnFunction(Function &F) {
@@ -127,7 +127,7 @@ namespace {
     }
   };
 
-  RegisterAnalysis<CFGOnlyPrinter>
+  RegisterPass<CFGOnlyPrinter>
   P2("print-cfg-only",
      "Print CFG of function to 'dot' file (with no function bodies)");
 }
diff --git a/lib/Analysis/DataStructure/BottomUpClosure.cpp b/lib/Analysis/DataStructure/BottomUpClosure.cpp
index dc7c761194..d2708b0fb1 100644
--- a/lib/Analysis/DataStructure/BottomUpClosure.cpp
+++ b/lib/Analysis/DataStructure/BottomUpClosure.cpp
@@ -37,7 +37,7 @@ namespace {
   UpdateGlobals("budatastructures-update-from-globals",
 		cl::desc("Update local graph from global graph when processing function"));
 
-  RegisterAnalysis<BUDataStructures>
+  RegisterPass<BUDataStructures>
   X("budatastructure", "Bottom-up Data Structure Analysis");
 }
 
diff --git a/lib/Analysis/DataStructure/CallTargets.cpp b/lib/Analysis/DataStructure/CallTargets.cpp
index 30d7d48334..eb1e28dcc6 100644
--- a/lib/Analysis/DataStructure/CallTargets.cpp
+++ b/lib/Analysis/DataStructure/CallTargets.cpp
@@ -34,7 +34,7 @@ namespace {
   Statistic<> CompleteInd("calltarget", "Number of complete indirect calls");
   Statistic<> CompleteEmpty("calltarget", "Number of complete empty calls");
 
-  RegisterAnalysis<CallTargetFinder> X("calltarget", "Find Call Targets (uses DSA)");
+  RegisterPass<CallTargetFinder> X("calltarget","Find Call Targets (uses DSA)");
 }
 
 void CallTargetFinder::findIndTargets(Module &M)
diff --git a/lib/Analysis/DataStructure/CompleteBottomUp.cpp b/lib/Analysis/DataStructure/CompleteBottomUp.cpp
index 452f0338cb..ea21a4f030 100644
--- a/lib/Analysis/DataStructure/CompleteBottomUp.cpp
+++ b/lib/Analysis/DataStructure/CompleteBottomUp.cpp
@@ -25,7 +25,7 @@
 using namespace llvm;
 
 namespace {
-  RegisterAnalysis<CompleteBUDataStructures>
+  RegisterPass<CompleteBUDataStructures>
   X("cbudatastructure", "'Complete' Bottom-up Data Structure Analysis");
   Statistic<> NumCBUInlines("cbudatastructures", "Number of graphs inlined");
 }
diff --git a/lib/Analysis/DataStructure/DataStructureStats.cpp b/lib/Analysis/DataStructure/DataStructureStats.cpp
index f4aff3013a..a73fc96e6e 100644
--- a/lib/Analysis/DataStructure/DataStructureStats.cpp
+++ b/lib/Analysis/DataStructure/DataStructureStats.cpp
@@ -60,7 +60,7 @@ namespace {
     void print(std::ostream &O, const Module* = 0) const { }
   };
 
-  static RegisterAnalysis<DSGraphStats> Z("dsstats", "DS Graph Statistics");
+  static RegisterPass<DSGraphStats> Z("dsstats", "DS Graph Statistics");
 }
 
 FunctionPass *llvm::createDataStructureStatsPass() { 
diff --git a/lib/Analysis/DataStructure/EquivClassGraphs.cpp b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
index cc536a7f89..9126ef9814 100644
--- a/lib/Analysis/DataStructure/EquivClassGraphs.cpp
+++ b/lib/Analysis/DataStructure/EquivClassGraphs.cpp
@@ -30,7 +30,7 @@
 using namespace llvm;
 
 namespace {
-  RegisterAnalysis<EquivClassGraphs> X("eqdatastructure",
+  RegisterPass<EquivClassGraphs> X("eqdatastructure",
                     "Equivalence-class Bottom-up Data Structure Analysis");
   Statistic<> NumEquivBUInlines("equivdatastructures",
                                 "Number of graphs inlined");
diff --git a/lib/Analysis/DataStructure/GraphChecker.cpp b/lib/Analysis/DataStructure/GraphChecker.cpp
index f42ea7eb08..50a41f2b9a 100644
--- a/lib/Analysis/DataStructure/GraphChecker.cpp
+++ b/lib/Analysis/DataStructure/GraphChecker.cpp
@@ -74,7 +74,7 @@ namespace {
     void verify(const DSGraph &G);
   };
 
-  RegisterAnalysis<DSGC> X("datastructure-gc", "DSA Graph Checking Pass");
+  RegisterPass<DSGC> X("datastructure-gc", "DSA Graph Checking Pass");
 }
 
 FunctionPass *llvm::createDataStructureGraphCheckerPass() {
diff --git a/lib/Analysis/DataStructure/Local.cpp b/lib/Analysis/DataStructure/Local.cpp
index ecf953230d..c70970ac31 100644
--- a/lib/Analysis/DataStructure/Local.cpp
+++ b/lib/Analysis/DataStructure/Local.cpp
@@ -33,7 +33,7 @@
 
 using namespace llvm;
 
-static RegisterAnalysis<LocalDataStructures>
+static RegisterPass<LocalDataStructures>
 X("datastructure", "Local Data Structure Analysis");
 
 static cl::opt<bool>
diff --git a/lib/Analysis/DataStructure/TopDownClosure.cpp b/lib/Analysis/DataStructure/TopDownClosure.cpp
index 2271fa4c9a..9fdaac3c34 100644
--- a/lib/Analysis/DataStructure/TopDownClosure.cpp
+++ b/lib/Analysis/DataStructure/TopDownClosure.cpp
@@ -32,7 +32,7 @@ using namespace llvm;
 #endif
 
 namespace {
-  RegisterAnalysis<TDDataStructures>   // Register the pass
+  RegisterPass<TDDataStructures>   // Register the pass
   Y("tddatastructure", "Top-down Data Structure Analysis");
 
   Statistic<> NumTDInlines("tddatastructures", "Number of graphs inlined");
diff --git a/lib/Analysis/IPA/FindUsedTypes.cpp b/lib/Analysis/IPA/FindUsedTypes.cpp
index 725cec4c01..d4ea9f9489 100644
--- a/lib/Analysis/IPA/FindUsedTypes.cpp
+++ b/lib/Analysis/IPA/FindUsedTypes.cpp
@@ -21,7 +21,7 @@
 #include "llvm/Support/InstIterator.h"
 using namespace llvm;
 
-static RegisterAnalysis<FindUsedTypes>
+static RegisterPass<FindUsedTypes>
 X("printusedtypes", "Find Used Types");
 
 // IncorporateType - Incorporate one type and all of its subtypes into the
diff --git a/lib/Analysis/InstCount.cpp b/lib/Analysis/InstCount.cpp
index df11fc4895..72bc2c7238 100644
--- a/lib/Analysis/InstCount.cpp
+++ b/lib/Analysis/InstCount.cpp
@@ -55,8 +55,8 @@ namespace {
 
   };
 
-  RegisterAnalysis<InstCount> X("instcount",
-                                "Counts the various types of Instructions");
+  RegisterPass<InstCount> X("instcount",
+                            "Counts the various types of Instructions");
 }
 
 FunctionPass *llvm::createInstCountPass() { return new InstCount(); }
diff --git a/lib/Analysis/IntervalPartition.cpp b/lib/Analysis/IntervalPartition.cpp
index a6b85d4b90..2385a7d247 100644
--- a/lib/Analysis/IntervalPartition.cpp
+++ b/lib/Analysis/IntervalPartition.cpp
@@ -15,7 +15,7 @@
 #include "llvm/Analysis/IntervalIterator.h"
 using namespace llvm;
 
-static RegisterAnalysis<IntervalPartition>
+static RegisterPass<IntervalPartition>
 X("intervals", "Interval Partition Construction", true);
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Analysis/LoopInfo.cpp b/lib/Analysis/LoopInfo.cpp
index a91c201e0c..907cf5f4fe 100644
--- a/lib/Analysis/LoopInfo.cpp
+++ b/lib/Analysis/LoopInfo.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 using namespace llvm;
 
-static RegisterAnalysis<LoopInfo>
+static RegisterPass<LoopInfo>
 X("loops", "Natural Loop Construction", true);
 
 //===----------------------------------------------------------------------===//
diff --git a/lib/Analysis/PostDominators.cpp b/lib/Analysis/PostDominators.cpp
index e195d7a4c7..ec7f7c7546 100644
--- a/lib/Analysis/PostDominators.cpp
+++ b/lib/Analysis/PostDominators.cpp
@@ -23,7 +23,7 @@ using namespace llvm;
 //  ImmediatePostDominators Implementation
 //===----------------------------------------------------------------------===//
 
-static RegisterAnalysis<ImmediatePostDominators>
+static RegisterPass<ImmediatePostDominators>
 D("postidom", "Immediate Post-Dominators Construction", true);
 
 unsigned ImmediatePostDominators::DFSPass(BasicBlock *V, InfoRec &VInfo,
@@ -145,7 +145,7 @@ bool ImmediatePostDominators::runOnFunction(Function &F) {
 //  PostDominatorSet Implementation
 //===----------------------------------------------------------------------===//
 
-static RegisterAnalysis<PostDominatorSet>
+static RegisterPass<PostDominatorSet>
 B("postdomset", "Post-Dominator Set Construction", true);
 
 // Postdominator set construction.  This converts the specified function to only
@@ -212,7 +212,7 @@ bool PostDominatorSet::runOnFunction(Function &F) {
 //  PostDominatorTree Implementation
 //===----------------------------------------------------------------------===//
 
-static RegisterAnalysis<PostDominatorTree>
+static RegisterPass<PostDominatorTree>
 F("postdomtree", "Post-Dominator Tree Construction", true);
 
 DominatorTreeBase::Node *PostDominatorTree::getNodeForBlock(BasicBlock *BB) {
@@ -258,7 +258,7 @@ void PostDominatorTree::calculate(const ImmediatePostDominators &IPD) {
 // PostETForest Implementation
 //===----------------------------------------------------------------------===//
 
-static RegisterAnalysis<PostETForest>
+static RegisterPass<PostETForest>
 G("postetforest", "Post-ET-Forest Construction", true);
 
 ETNode *PostETForest::getNodeForBlock(BasicBlock *BB) {
@@ -322,7 +322,7 @@ void PostETForest::calculate(const ImmediatePostDominators &ID) {
 //  PostDominanceFrontier Implementation
 //===----------------------------------------------------------------------===//
 
-static RegisterAnalysis<PostDominanceFrontier>
+static RegisterPass<PostDominanceFrontier>
 H("postdomfrontier", "Post-Dominance Frontier Construction", true);
 
 const DominanceFrontier::DomSetType &
diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index 37c6a44ee8..289297cf3a 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -80,7 +80,7 @@
 using namespace llvm;
 
 namespace {
-  RegisterAnalysis<ScalarEvolution>
+  RegisterPass<ScalarEvolution>
   R("scalar-evolution", "Scalar Evolution Analysis");
 
   Statistic<>