diff --git a/include/llvm/Analysis/CallGraph.h b/include/llvm/Analysis/CallGraph.h
index 97fd37c3782..7e8ff9e08c2 100644
--- a/include/llvm/Analysis/CallGraph.h
+++ b/include/llvm/Analysis/CallGraph.h
@@ -123,7 +123,7 @@ public:
   //
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  CallGraph(AnalysisID AID) : Root(0) { assert(AID == ID); }
+  CallGraph() : Root(0) {}
   ~CallGraph() { destroy(); }
 
   virtual const char *getPassName() const { return "Call Graph Construction"; }
diff --git a/include/llvm/Analysis/DataStructure.h b/include/llvm/Analysis/DataStructure.h
index b008b6e6a72..d4e61db64b9 100644
--- a/include/llvm/Analysis/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure.h
@@ -330,7 +330,6 @@ class LocalDataStructures : public Pass {
 public:
   static AnalysisID ID;            // DataStructure Analysis ID 
 
-  LocalDataStructures(AnalysisID id) { assert(id == ID); }
   ~LocalDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
@@ -370,7 +369,6 @@ class BUDataStructures : public Pass {
 public:
   static AnalysisID ID;            // BUDataStructure Analysis ID 
 
-  BUDataStructures(AnalysisID id) { assert(id == ID); }
   ~BUDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
@@ -413,7 +411,6 @@ class TDDataStructures : public Pass {
 public:
   static AnalysisID ID;            // TDDataStructure Analysis ID 
 
-  TDDataStructures(AnalysisID id) { assert(id == ID); }
   ~TDDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
diff --git a/include/llvm/Analysis/DataStructure/DataStructure.h b/include/llvm/Analysis/DataStructure/DataStructure.h
index b008b6e6a72..d4e61db64b9 100644
--- a/include/llvm/Analysis/DataStructure/DataStructure.h
+++ b/include/llvm/Analysis/DataStructure/DataStructure.h
@@ -330,7 +330,6 @@ class LocalDataStructures : public Pass {
 public:
   static AnalysisID ID;            // DataStructure Analysis ID 
 
-  LocalDataStructures(AnalysisID id) { assert(id == ID); }
   ~LocalDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
@@ -370,7 +369,6 @@ class BUDataStructures : public Pass {
 public:
   static AnalysisID ID;            // BUDataStructure Analysis ID 
 
-  BUDataStructures(AnalysisID id) { assert(id == ID); }
   ~BUDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
@@ -413,7 +411,6 @@ class TDDataStructures : public Pass {
 public:
   static AnalysisID ID;            // TDDataStructure Analysis ID 
 
-  TDDataStructures(AnalysisID id) { assert(id == ID); }
   ~TDDataStructures() { releaseMemory(); }
 
   virtual const char *getPassName() const {
diff --git a/include/llvm/Analysis/Dominators.h b/include/llvm/Analysis/Dominators.h
index c9019867d3b..9df1e656392 100644
--- a/include/llvm/Analysis/Dominators.h
+++ b/include/llvm/Analysis/Dominators.h
@@ -96,7 +96,7 @@ public:
 struct DominatorSet : public DominatorSetBase {
   static AnalysisID ID;            // Build dominator set
 
-  DominatorSet(AnalysisID id) : DominatorSetBase(false) { assert(id == ID); }
+  DominatorSet() : DominatorSetBase(false) {}
 
   virtual const char *getPassName() const {
     return "Dominator Set Construction";
@@ -119,7 +119,7 @@ struct DominatorSet : public DominatorSetBase {
 struct PostDominatorSet : public DominatorSetBase {
   static AnalysisID ID;            // Build post-dominator set
 
-  PostDominatorSet(AnalysisID id) : DominatorSetBase(true) { assert(id == ID); }
+  PostDominatorSet() : DominatorSetBase(true) {}
 
   virtual const char *getPassName() const {
     return "Post-Dominator Set Construction";
@@ -174,9 +174,7 @@ public:
 struct ImmediateDominators : public ImmediateDominatorsBase {
   static AnalysisID ID;         // Build immediate dominators
 
-  ImmediateDominators(AnalysisID id) : ImmediateDominatorsBase(false) {
-    assert(id == ID);
-  }
+  ImmediateDominators() : ImmediateDominatorsBase(false) {}
 
   virtual const char *getPassName() const {
     return "Immediate Dominators Construction";
@@ -205,9 +203,7 @@ struct ImmediateDominators : public ImmediateDominatorsBase {
 struct ImmediatePostDominators : public ImmediateDominatorsBase {
   static AnalysisID ID;         // Build immediate postdominators
 
-  ImmediatePostDominators(AnalysisID id) : ImmediateDominatorsBase(true) {
-    assert(id == ID);
-  }
+  ImmediatePostDominators() : ImmediateDominatorsBase(true) {}
 
   virtual const char *getPassName() const {
     return "Immediate Post-Dominators Construction";
@@ -289,9 +285,7 @@ public:
 struct DominatorTree : public DominatorTreeBase {
   static AnalysisID ID;         // Build dominator tree
 
-  DominatorTree(AnalysisID id) : DominatorTreeBase(false) {
-    assert(id == ID);
-  }
+  DominatorTree() : DominatorTreeBase(false) {}
 
   virtual const char *getPassName() const {
     return "Dominator Tree Construction";
@@ -322,9 +316,7 @@ private:
 struct PostDominatorTree : public DominatorTreeBase {
   static AnalysisID ID;         // Build immediate postdominators
 
-  PostDominatorTree(AnalysisID id) : DominatorTreeBase(true) {
-    assert(id == ID);
-  }
+  PostDominatorTree() : DominatorTreeBase(true) {}
 
   virtual const char *getPassName() const {
     return "Post-Dominator Tree Construction";
@@ -378,9 +370,7 @@ public:
 struct DominanceFrontier : public DominanceFrontierBase {
   static AnalysisID ID;         // Build dominance frontier
 
-  DominanceFrontier(AnalysisID id) : DominanceFrontierBase(false) {
-    assert(id == ID);
-  }
+  DominanceFrontier() : DominanceFrontierBase(false) {}
 
   virtual const char *getPassName() const {
     return "Dominance Frontier Construction";
@@ -413,9 +403,7 @@ private:
 struct PostDominanceFrontier : public DominanceFrontierBase {
   static AnalysisID ID;         // Build post dominance frontier
 
-  PostDominanceFrontier(AnalysisID id) : DominanceFrontierBase(true) {
-    assert(id == ID);
-  }
+  PostDominanceFrontier() : DominanceFrontierBase(true) {}
 
   virtual const char *getPassName() const {
     return "Post-Dominance Frontier Construction";
diff --git a/include/llvm/Analysis/FindUnsafePointerTypes.h b/include/llvm/Analysis/FindUnsafePointerTypes.h
index d88b59ac2d1..b4aa919b570 100644
--- a/include/llvm/Analysis/FindUnsafePointerTypes.h
+++ b/include/llvm/Analysis/FindUnsafePointerTypes.h
@@ -28,7 +28,7 @@ struct FindUnsafePointerTypes : public Pass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  FindUnsafePointerTypes(AnalysisID id) { assert(ID == id); }
+  FindUnsafePointerTypes() {}
 
   virtual const char *getPassName() const { return "Find Unsafe Pointer Types";}
 
diff --git a/include/llvm/Analysis/FindUsedTypes.h b/include/llvm/Analysis/FindUsedTypes.h
index 5e37878aa92..4e5e0512561 100644
--- a/include/llvm/Analysis/FindUsedTypes.h
+++ b/include/llvm/Analysis/FindUsedTypes.h
@@ -20,7 +20,7 @@ public:
   //
   static AnalysisID ID;
 
-  FindUsedTypes(AnalysisID id) { assert(ID == id); }
+  FindUsedTypes() {}
   virtual const char *getPassName() const { return "Find Used Types"; }
 
   // getTypes - After the pass has been run, return the set containing all of
diff --git a/include/llvm/Analysis/IntervalPartition.h b/include/llvm/Analysis/IntervalPartition.h
index bf7228606ff..307a70a87cd 100644
--- a/include/llvm/Analysis/IntervalPartition.h
+++ b/include/llvm/Analysis/IntervalPartition.h
@@ -37,7 +37,7 @@ class IntervalPartition : public FunctionPass, public std::vector<Interval*> {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  IntervalPartition(AnalysisID AID) : RootInterval(0) { assert(AID == ID); }
+  IntervalPartition() : RootInterval(0) {}
 
   const char *getPassName() const { return "Interval Partition Construction"; }
 
diff --git a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
index ee21d4fdbe1..38cb3f09e3e 100644
--- a/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
+++ b/include/llvm/Analysis/LiveVar/FunctionLiveVarInfo.h
@@ -91,8 +91,6 @@ class FunctionLiveVarInfo : public FunctionPass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  FunctionLiveVarInfo(AnalysisID id = ID) { assert(id == ID); }
-
   virtual const char *getPassName() const { return "Live Variable Analysis"; }
 
   // --------- Implement the FunctionPass interface ----------------------
diff --git a/include/llvm/Analysis/LoopInfo.h b/include/llvm/Analysis/LoopInfo.h
index d5721ae6a0e..c04dcfa5d18 100644
--- a/include/llvm/Analysis/LoopInfo.h
+++ b/include/llvm/Analysis/LoopInfo.h
@@ -69,7 +69,6 @@ public:
   static AnalysisID ID;            // LoopInfo Analysis ID 
 
   // LoopInfo ctor - Calculate the natural loop information for a CFG
-  LoopInfo(AnalysisID id) { assert(id == ID); }
   ~LoopInfo() { releaseMemory(); }
 
   const char *getPassName() const { return "Natural Loop Analysis"; }
diff --git a/include/llvm/CodeGen/FunctionLiveVarInfo.h b/include/llvm/CodeGen/FunctionLiveVarInfo.h
index ee21d4fdbe1..38cb3f09e3e 100644
--- a/include/llvm/CodeGen/FunctionLiveVarInfo.h
+++ b/include/llvm/CodeGen/FunctionLiveVarInfo.h
@@ -91,8 +91,6 @@ class FunctionLiveVarInfo : public FunctionPass {
 public:
   static AnalysisID ID;    // We are an analysis, we must have an ID
 
-  FunctionLiveVarInfo(AnalysisID id = ID) { assert(id == ID); }
-
   virtual const char *getPassName() const { return "Live Variable Analysis"; }
 
   // --------- Implement the FunctionPass interface ----------------------