AST: Eliminate GenericEnvironment::mapConformanceRefIntoContext()

Author: slavapestov

include/swift/AST/GenericEnvironment.h

@@ -325,19 +325,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   /// abstraction level of their associated type requirements.
   SILType mapTypeIntoContext(SILModule &M, SILType type) const;
 
-  /// Map an interface type's protocol conformance into the corresponding
-  /// conformance for the contextual type.
-  static std::pair<Type, ProtocolConformanceRef>
-  mapConformanceRefIntoContext(GenericEnvironment *genericEnv,
-                               Type conformingType,
-                               ProtocolConformanceRef conformance);
-
-  /// Map an interface type's protocol conformance into the corresponding
-  /// conformance for the contextual type.
-  std::pair<Type, ProtocolConformanceRef>
-  mapConformanceRefIntoContext(Type conformingType,
-                               ProtocolConformanceRef conformance) const;
-
   /// Returns a substitution map that sends every generic parameter to its
   /// corresponding archetype in this generic environment.
   SubstitutionMap getForwardingSubstitutionMap() const;

lib/AST/GenericEnvironment.cpp

@@ -752,28 +752,6 @@ SubstitutionMap GenericEnvironment::getForwardingSubstitutionMap() const {
                               MakeAbstractConformanceForGenericType());
 }
 
-std::pair<Type, ProtocolConformanceRef>
-GenericEnvironment::mapConformanceRefIntoContext(GenericEnvironment *genericEnv,
-                                           Type conformingType,
-                                           ProtocolConformanceRef conformance) {
-  if (!genericEnv)
-    return {conformingType, conformance};
-  
-  return genericEnv->mapConformanceRefIntoContext(conformingType, conformance);
-}
-
-std::pair<Type, ProtocolConformanceRef>
-GenericEnvironment::mapConformanceRefIntoContext(
-                                     Type conformingInterfaceType,
-                                     ProtocolConformanceRef conformance) const {
-  auto contextConformance = conformance.subst(
-    QueryInterfaceTypeSubstitutions(this),
-    LookUpConformanceInModule());
-  
-  auto contextType = mapTypeIntoContext(conformingInterfaceType);
-  return {contextType, contextConformance};
-}
-
 OpenedElementContext
 OpenedElementContext::createForContextualExpansion(ASTContext &ctx,
                                        CanPackExpansionType expansionType) {

lib/IRGen/GenMeta.cpp

@@ -2877,9 +2877,10 @@ namespace {
             substitutions.lookupConformance(underlyingDependentType, P);
 
         if (underlyingType->hasTypeParameter()) {
-          std::tie(underlyingType, underlyingConformance)
-              = GenericEnvironment::mapConformanceRefIntoContext(
-                    genericEnv, underlyingType, underlyingConformance);
+          underlyingType = genericEnv->mapTypeIntoContext(
+              underlyingType);
+          underlyingConformance = underlyingConformance.subst(
+            genericEnv->getForwardingSubstitutionMap());
         }
 
         return emitWitnessTableRef(IGF, underlyingType->getCanonicalType(),

lib/SILGen/SILGenExpr.cpp

@@ -4144,11 +4144,12 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
 
       Type formalTy = index.FormalType;
       ProtocolConformanceRef hashable = index.Hashable;
-      std::tie(formalTy, hashable)
-        = GenericEnvironment::mapConformanceRefIntoContext(genericEnv,
-                                                           formalTy,
-                                                           hashable);
-      auto formalCanTy = formalTy->getReducedType(genericSig);
+      if (genericEnv) {
+        formalTy = genericEnv->mapTypeIntoContext(formalTy);
+        hashable = hashable.subst(genericEnv->getForwardingSubstitutionMap());
+      }
+
+      auto formalCanTy = formalTy->getCanonicalType();
 
       // Get the Equatable conformance from the Hashable conformance.
       auto equatable = hashable.getAssociatedConformance(

lib/Sema/AssociatedTypeInference.cpp

@@ -2903,8 +2903,8 @@ bool AssociatedTypeInference::checkCurrentTypeWitnesses(
 
   ProtocolConformanceRef conformanceInContext(conformance);
   if (auto *genericEnv = conformance->getGenericEnvironment()) {
-    conformanceInContext =
-      conformanceInContext.subst(genericEnv->getForwardingSubstitutionMap());
+    conformanceInContext = conformanceInContext.subst(
+        genericEnv->getForwardingSubstitutionMap());
   }
 
   auto substitutions =