Silencing an "enumeral and non-enumeral type in conditional expression" warning;...

[oota-llvm.git] / lib / IR / PassRegistry.cpp

diff --git a/lib/IR/PassRegistry.cpp b/lib/IR/PassRegistry.cpp
index b3050a906895b49e960c8c1572dbd469aabb299b..b879fef3f4a725128f0fea00b36c91f0c1e9a3dd 100644 (file)
--- a/lib/IR/PassRegistry.cpp
+++ b/lib/IR/PassRegistry.cpp
@@ -63,29 +63,17 @@ void PassRegistry::registerPass(const PassInfo &PI, bool ShouldFree) {
   PassInfoStringMap[PI.getPassArgument()] = Π
 
   // Notify any listeners.
-  for (std::vector<PassRegistrationListener *>::iterator I = Listeners.begin(),
-                                                         E = Listeners.end();
-       I != E; ++I)
-    (*I)->passRegistered(&PI);
+  for (auto *Listener : Listeners)
+    Listener->passRegistered(&PI);
 
   if (ShouldFree)
     ToFree.push_back(std::unique_ptr<const PassInfo>(&PI));
 }
 
-void PassRegistry::unregisterPass(const PassInfo &PI) {
-  sys::SmartScopedWriter<true> Guard(Lock);
-  MapType::iterator I = PassInfoMap.find(PI.getTypeInfo());
-  assert(I != PassInfoMap.end() && "Pass registered but not in map!");
-
-  // Remove pass from the map.
-  PassInfoMap.erase(I);
-  PassInfoStringMap.erase(PI.getPassArgument());
-}
-
 void PassRegistry::enumerateWith(PassRegistrationListener *L) {
   sys::SmartScopedReader<true> Guard(Lock);
-  for (auto I = PassInfoMap.begin(), E = PassInfoMap.end(); I != E; ++I)
-    L->passEnumerate(I->second);
+  for (auto PassInfoPair : PassInfoMap)
+    L->passEnumerate(PassInfoPair.second);
 }
 
 /// Analysis Group Mechanisms.
@@ -113,10 +101,6 @@ void PassRegistry::registerAnalysisGroup(const void *InterfaceID,
     // the interface.
     ImplementationInfo->addInterfaceImplemented(InterfaceInfo);
 
-    AnalysisGroupInfo &AGI = AnalysisGroupInfoMap[InterfaceInfo];
-    assert(AGI.Implementations.count(ImplementationInfo) == 0 &&
-           "Cannot add a pass to the same analysis group more than once!");
-    AGI.Implementations.insert(ImplementationInfo);
     if (isDefault) {
       assert(InterfaceInfo->getNormalCtor() == nullptr &&
              "Default implementation for analysis group already specified!");