AST: Remove SubstitutionMap::getConformances()

Author: slavapestov

include/swift/AST/SubstitutionMap.h

@@ -80,9 +80,6 @@ class SubstitutionMap {
                 CanType type, ProtocolDecl *proto,
                 llvm::SmallPtrSetImpl<CanType> *visitedParents = nullptr) const;
 
-  /// Retrieve the conformances for the given type.
-  ArrayRef<ProtocolConformanceRef> getConformances(CanType type) const;
-
   bool empty() const {
     return subMap.empty();
   }

lib/AST/SubstitutionMap.cpp

@@ -209,13 +209,6 @@ addConformance(CanType type, ProtocolConformanceRef conformance) {
   conformanceMap[type.getPointer()].push_back(conformance);
 }
 
-ArrayRef<ProtocolConformanceRef> SubstitutionMap::
-getConformances(CanType type) const {
-  auto known = conformanceMap.find(type.getPointer());
-  if (known == conformanceMap.end()) return { };
-  return known->second;
-}
-
 void SubstitutionMap::
 addParent(CanType type, CanType parent, AssociatedTypeDecl *assocType) {
   assert(type && parent && assocType);

lib/SIL/Mangle.cpp

@@ -51,15 +51,22 @@ void GenericSpecializationMangler::mangleSpecialization() {
   SILFunctionType *FTy = Function->getLoweredFunctionType();
   CanGenericSignature Sig = FTy->getGenericSignature();
   auto SubMap = Sig->getSubstitutionMap(Subs);
-  for (Type DepType : Sig->getSubstitutableParams()) {
-    M.mangleType(DepType.subst(SubMap)->getCanonicalType(), 0);
-    for (auto C : SubMap.getConformances(DepType->getCanonicalType())) {
-      if (C.isAbstract())
-        return;
-      M.mangleProtocolConformance(C.getConcrete());
-    }
-    M.append('_');
-  }
+  Sig->enumeratePairedRequirements(
+    [&](Type depTy, ArrayRef<Requirement> reqts) {
+      if (depTy->is<GenericTypeParamType>())
+        M.mangleType(depTy.subst(SubMap)->getCanonicalType(), 0);
+
+      for (auto reqt : reqts) {
+        auto conformance = SubMap.lookupConformance(
+            depTy->getCanonicalType(),
+            reqt.getSecondType()->castTo<ProtocolType>()->getDecl());
+        if (conformance && conformance->isConcrete())
+          M.mangleProtocolConformance(conformance->getConcrete());
+      }
+      M.append('_');
+
+      return false;
+    });
 }
 
 void PartialSpecializationMangler::mangleSpecialization() {