AST: Remove useless overload of GenericEnvironment::mapTypeIntoContext()

Author: slavapestov

include/swift/AST/GenericEnvironment.h

@@ -157,8 +157,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   friend ArchetypeType;
   friend QueryInterfaceTypeSubstitutions;
 
-  Type getOrCreateArchetypeFromInterfaceType(Type depType);
-
   /// Add a mapping of a generic parameter to a specific type (which may be
   /// an archetype)
   void addMapping(GenericParamKey key, Type contextType);
@@ -283,13 +281,12 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   /// Map an interface type to a contextual type.
   Type mapTypeIntoContext(Type type) const;
 
-  /// Map an interface type to a contextual type.
-  Type mapTypeIntoContext(Type type,
-                          LookupConformanceFn lookupConformance) const;
-
   /// Map a generic parameter type to a contextual type.
   Type mapTypeIntoContext(GenericTypeParamType *type) const;
 
+  /// Map a type parameter type to a contextual type.
+  Type getOrCreateArchetypeFromInterfaceType(Type depType);
+
   /// Map an interface type containing parameter packs to a contextual
   /// type in the opened element generic context.
   Type mapPackTypeIntoElementContext(Type type) const;

lib/AST/GenericEnvironment.cpp

@@ -507,21 +507,14 @@ Type QueryInterfaceTypeSubstitutions::operator()(SubstitutableType *type) const{
   return Type();
 }
 
-Type GenericEnvironment::mapTypeIntoContext(
-                                Type type,
-                                LookupConformanceFn lookupConformance) const {
+Type GenericEnvironment::mapTypeIntoContext(Type type) const {
   assert(!type->hasPrimaryArchetype() && "already have a contextual type");
 
   Type result = type.subst(QueryInterfaceTypeSubstitutions(this),
-                           lookupConformance,
+                           LookUpConformanceInModule(),
                            SubstFlags::PreservePackExpansionLevel);
   ASSERT(getKind() != Kind::Primary || !result->hasTypeParameter());
   return result;
-
-}
-
-Type GenericEnvironment::mapTypeIntoContext(Type type) const {
-  return mapTypeIntoContext(type, LookUpConformanceInModule());
 }
 
 Type GenericEnvironment::mapTypeIntoContext(GenericTypeParamType *type) const {