diff --git a/llvm/include/llvm/Analysis/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure.h
index c080c97e593b..54ea1f9d060e 100644
--- a/llvm/include/llvm/Analysis/DataStructure.h
+++ b/llvm/include/llvm/Analysis/DataStructure.h
@@ -444,7 +444,7 @@ public:
   // getAnalysisUsage - This obviously provides a data structure graph.
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(LocalDataStructures::ID);
+    AU.addRequired<LocalDataStructures>();
   }
 private:
   DSGraph &calculateGraph(Function &F);
@@ -481,7 +481,7 @@ public:
   // getAnalysisUsage - This obviously provides a data structure graph.
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(BUDataStructures::ID);
+    AU.addRequired<BUDataStructures>();
   }
 private:
   DSGraph &calculateGraph(Function &F);
diff --git a/llvm/include/llvm/Analysis/Dominators.h b/llvm/include/llvm/Analysis/Dominators.h
index 2beb4ba25e06..ba67fead8eb5 100644
--- a/llvm/include/llvm/Analysis/Dominators.h
+++ b/llvm/include/llvm/Analysis/Dominators.h
@@ -183,7 +183,7 @@ struct ImmediateDominators : public ImmediateDominatorsBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(DominatorSet::ID);
+    AU.addRequired<DominatorSet>();
   }
 };
 
@@ -207,7 +207,7 @@ struct ImmediatePostDominators : public ImmediateDominatorsBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(PostDominatorSet::ID);
+    AU.addRequired<PostDominatorSet>();
   }
 };
 
@@ -287,7 +287,7 @@ struct DominatorTree : public DominatorTreeBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(DominatorSet::ID);
+    AU.addRequired<DominatorSet>();
   }
 private:
   void calculate(const DominatorSet &DS);
@@ -313,7 +313,7 @@ struct PostDominatorTree : public DominatorTreeBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(PostDominatorSet::ID);
+    AU.addRequired<PostDominatorSet>();
   }
 private:
   void calculate(const PostDominatorSet &DS);
@@ -365,7 +365,7 @@ struct DominanceFrontier : public DominanceFrontierBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(DominatorTree::ID);
+    AU.addRequired<DominatorTree>();
   }
 private:
   const DomSetType &calculate(const DominatorTree &DT,
@@ -393,7 +393,7 @@ struct PostDominanceFrontier : public DominanceFrontierBase {
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
     AU.setPreservesAll();
-    AU.addRequired(PostDominatorTree::ID);
+    AU.addRequired<PostDominatorTree>();
   }
 private:
   const DomSetType &calculate(const PostDominatorTree &DT,
diff --git a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
index 016aedc1f218..3eae49ce1c58 100644
--- a/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
+++ b/llvm/lib/CodeGen/InstrSched/InstrScheduling.cpp
@@ -1502,7 +1502,7 @@ namespace {
   
     // getAnalysisUsage - We use LiveVarInfo...
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(FunctionLiveVarInfo::ID);
+      AU.addRequired<FunctionLiveVarInfo>();
     }
     
     bool runOnFunction(Function &F);
diff --git a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
index 3473f526dcd8..842bc58b2965 100644
--- a/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
+++ b/llvm/lib/Transforms/IPO/DeadTypeElimination.cpp
@@ -27,7 +27,7 @@ namespace {
     // getAnalysisUsage - This function needs FindUsedTypes to do its job...
     //
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(FindUsedTypes::ID);
+      AU.addRequired<FindUsedTypes>();
     }
   };
   RegisterOpt<DTE> X("deadtypeelim", "Dead Type Elimination");
diff --git a/llvm/lib/Transforms/IPO/GlobalDCE.cpp b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
index 029456ef5e6f..c87f2ae18b9c 100644
--- a/llvm/lib/Transforms/IPO/GlobalDCE.cpp
+++ b/llvm/lib/Transforms/IPO/GlobalDCE.cpp
@@ -83,7 +83,7 @@ namespace {
     // module.
     //
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(CallGraph::ID);
+      AU.addRequired<CallGraph>();
     }
   };
   RegisterOpt<GlobalDCE> X("globaldce", "Dead Global Elimination");
diff --git a/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp b/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp
index 43fd162d8e61..67ba0f12f1ec 100644
--- a/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp
+++ b/llvm/lib/Transforms/IPO/OldPoolAllocate.cpp
@@ -246,7 +246,7 @@ namespace {
     // to be able to see what is pool allocatable.
     //
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(DataStructure::ID);
+      AU.addRequired<DataStructure>();
     }
 
   public:
diff --git a/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp b/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
index 59871556aca3..022d6d822c52 100644
--- a/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
+++ b/llvm/lib/Transforms/IPO/SimpleStructMutation.cpp
@@ -29,8 +29,8 @@ namespace {
     // FindUsedTypes and FindUnsafePointerTypes analysis passes...
     //
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(FindUsedTypes::ID);
-      AU.addRequired(FindUnsafePointerTypes::ID);
+      AU.addRequired<FindUsedTypes>();
+      AU.addRequired<FindUnsafePointerTypes>();
       MutateStructTypes::getAnalysisUsage(AU);
     }
     
diff --git a/llvm/lib/Transforms/Scalar/ADCE.cpp b/llvm/lib/Transforms/Scalar/ADCE.cpp
index 126a32b6f086..062b52ff50c0 100644
--- a/llvm/lib/Transforms/Scalar/ADCE.cpp
+++ b/llvm/lib/Transforms/Scalar/ADCE.cpp
@@ -55,8 +55,8 @@ public:
   // getAnalysisUsage - We require post dominance frontiers (aka Control
   // Dependence Graph)
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.addRequired(PostDominatorTree::ID);
-    AU.addRequired(PostDominanceFrontier::ID);
+    AU.addRequired<PostDominatorTree>();
+    AU.addRequired<PostDominanceFrontier>();
   }
 
 
diff --git a/llvm/lib/Transforms/Scalar/GCSE.cpp b/llvm/lib/Transforms/Scalar/GCSE.cpp
index 6aca922811b5..6f86aa85a449 100644
--- a/llvm/lib/Transforms/Scalar/GCSE.cpp
+++ b/llvm/lib/Transforms/Scalar/GCSE.cpp
@@ -79,8 +79,8 @@ namespace {
     // This transformation requires dominator and immediate dominator info
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.preservesCFG();
-      AU.addRequired(DominatorSet::ID);
-      AU.addRequired(ImmediateDominators::ID); 
+      AU.addRequired<DominatorSet>();
+      AU.addRequired<ImmediateDominators>();
     }
   };
 
diff --git a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
index ceb057d34592..4e3e65beaf33 100644
--- a/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/llvm/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -193,7 +193,7 @@ namespace {
     }
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(LoopInfo::ID);
+      AU.addRequired<LoopInfo>();
       AU.preservesCFG();
     }
   };
diff --git a/llvm/lib/Transforms/Scalar/LICM.cpp b/llvm/lib/Transforms/Scalar/LICM.cpp
index 9f3c75705afa..1f743efe9bf1 100644
--- a/llvm/lib/Transforms/Scalar/LICM.cpp
+++ b/llvm/lib/Transforms/Scalar/LICM.cpp
@@ -39,7 +39,7 @@ namespace {
     // This transformation requires natural loop information...
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.preservesCFG();
-      AU.addRequired(LoopInfo::ID); 
+      AU.addRequired<LoopInfo>();
     }
 
   private:
diff --git a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
index 399b5fee88cb..bf0119f2f3c3 100644
--- a/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
+++ b/llvm/lib/Transforms/Scalar/PiNodeInsertion.cpp
@@ -44,7 +44,7 @@ namespace {
     
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
       AU.preservesCFG();
-      AU.addRequired(DominatorSet::ID);
+      AU.addRequired<DominatorSet>();
     }
 
     // insertPiNodeFor - Insert a Pi node for V in the successors of BB if our
diff --git a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
index 0a92d0d9060b..d3aca318b0a9 100644
--- a/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
+++ b/llvm/lib/Transforms/Utils/PromoteMemoryToRegister.cpp
@@ -55,7 +55,7 @@ namespace {
     // getAnalysisUsage - We need dominance frontiers
     //
     virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(DominanceFrontier::ID);
+      AU.addRequired<DominanceFrontier>();
       AU.preservesCFG();
     }
 
diff --git a/llvm/tools/analyze/AnalysisWrappers.cpp b/llvm/tools/analyze/AnalysisWrappers.cpp
index db69517fabaa..a674e7c8fbb4 100644
--- a/llvm/tools/analyze/AnalysisWrappers.cpp
+++ b/llvm/tools/analyze/AnalysisWrappers.cpp
@@ -53,7 +53,7 @@ namespace {
     }
     
     void getAnalysisUsage(AnalysisUsage &AU) const {
-      AU.addRequired(LoopInfo::ID);
+      AU.addRequired<LoopInfo>();
       AU.setPreservesAll();
     }
   };
diff --git a/llvm/tools/analyze/analyze.cpp b/llvm/tools/analyze/analyze.cpp
index f6a88c18f0c2..a40b8b8d1ff2 100644
--- a/llvm/tools/analyze/analyze.cpp
+++ b/llvm/tools/analyze/analyze.cpp
@@ -25,14 +25,14 @@ struct ModulePassPrinter : public Pass {
   virtual bool run(Module &M) {
     std::cout << "Printing Analysis info for Pass "
               << PassToPrint->getPassName() << ":\n";
-    getAnalysis<Pass>(PassToPrint).print(std::cout, &M);
+    getAnalysisID<Pass>(PassToPrint).print(std::cout, &M);
     
     // Get and print pass...
     return false;
   }
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.addRequired(PassToPrint);
+    AU.addRequiredID(PassToPrint);
     AU.setPreservesAll();
   }
 };
@@ -44,14 +44,14 @@ struct FunctionPassPrinter : public FunctionPass {
   virtual bool runOnFunction(Function &F) {
     std::cout << "Printing Analysis info for function '" << F.getName()
               << "': Pass " << PassToPrint->getPassName() << ":\n";
-    getAnalysis<Pass>(PassToPrint).print(std::cout, F.getParent());
+    getAnalysisID<Pass>(PassToPrint).print(std::cout, F.getParent());
 
     // Get and print pass...
     return false;
   }
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.addRequired(PassToPrint);
+    AU.addRequiredID(PassToPrint);
     AU.setPreservesAll();
   }
 };
@@ -63,14 +63,14 @@ struct BasicBlockPassPrinter : public BasicBlockPass {
   virtual bool runOnBasicBlock(BasicBlock &BB) {
     std::cout << "Printing Analysis info for BasicBlock '" << BB.getName()
               << "': Pass " << PassToPrint->getPassName() << ":\n";
-    getAnalysis<Pass>(PassToPrint).print(std::cout, BB.getParent()->getParent());
+    getAnalysisID<Pass>(PassToPrint).print(std::cout, BB.getParent()->getParent());
 
     // Get and print pass...
     return false;
   }
 
   virtual void getAnalysisUsage(AnalysisUsage &AU) const {
-    AU.addRequired(PassToPrint);
+    AU.addRequiredID(PassToPrint);
     AU.setPreservesAll();
   }
 };