AST: Remove origType parameter from ProtocolConformanceRef::getAssociatedType()

Author: slavapestov

include/swift/AST/ProtocolConformanceRef.h

@@ -209,7 +209,7 @@ class ProtocolConformanceRef {
 
   /// Given a dependent type (expressed in terms of this conformance's
   /// protocol), follow it from the conforming type.
-  Type getAssociatedType(Type origType, Type dependentType) const;
+  Type getAssociatedType(Type dependentType) const;
 
   /// Given a dependent type (expressed in terms of this conformance's
   /// protocol) and conformance, follow it from the conforming type.

lib/AST/PackConformance.cpp

@@ -142,18 +142,15 @@ PackConformance *PackConformance::getAssociatedConformance(
     auto packElement = ConformingType->getElementType(i);
 
     if (auto *packExpansion = packElement->getAs<PackExpansionType>()) {
-      auto assocTypePattern =
-        conformances[i].getAssociatedType(packExpansion->getPatternType(),
-                                          assocType);
+      auto assocTypePattern = conformances[i].getAssociatedType(assocType);
       packElements.push_back(PackExpansionType::get(
           assocTypePattern, packExpansion->getCountType()));
 
       auto assocConformancePattern =
         conformances[i].getAssociatedConformance(assocType, protocol);
       packConformances.push_back(assocConformancePattern);
     } else {
-      auto assocTypeScalar =
-        conformances[i].getAssociatedType(packElement, assocType);
+      auto assocTypeScalar = conformances[i].getAssociatedType(assocType);
       packElements.push_back(assocTypeScalar);
 
       auto assocConformanceScalar =

lib/AST/ProtocolConformance.cpp

@@ -628,7 +628,7 @@ Type ProtocolConformance::getAssociatedType(Type assocType) const {
          "associated type must be a type parameter");
 
   ProtocolConformanceRef ref(const_cast<ProtocolConformance*>(this));
-  return ref.getAssociatedType(getType(), assocType);
+  return ref.getAssociatedType(assocType);
 }
 
 ProtocolConformanceRef

lib/AST/ProtocolConformanceRef.cpp

@@ -210,15 +210,12 @@ Type ProtocolConformanceRef::getTypeWitness(AssociatedTypeDecl *assocType,
   return DependentMemberType::get(conformingType, assocType);
 }
 
-Type ProtocolConformanceRef::getAssociatedType(Type conformingType,
-                                               Type assocType) const {
+Type ProtocolConformanceRef::getAssociatedType(Type assocType) const {
   if (isInvalid())
     return ErrorType::get(assocType->getASTContext());
 
-  auto proto = getProtocol();
-
   auto substMap =
-    SubstitutionMap::getProtocolSubstitutions(proto, conformingType, *this);
+    SubstitutionMap::getProtocolSubstitutions(getProtocol(), getType(), *this);
   return assocType.subst(substMap);
 }
 

lib/IRGen/GenProto.cpp

@@ -3448,8 +3448,7 @@ MetadataResponse MetadataPath::followComponent(IRGenFunction &IGF,
     auto association = entry.getAssociatedConformancePath();
     auto associatedRequirement = entry.getAssociatedConformanceRequirement();
 
-    CanType associatedType =
-      sourceConformance.getAssociatedType(sourceType, association)
+    CanType associatedType = sourceConformance.getAssociatedType(association)
         ->getCanonicalType();
     sourceKey.Type = associatedType;
 
@@ -3527,7 +3526,7 @@ MetadataResponse MetadataPath::followComponent(IRGenFunction &IGF,
       // type directly.
       auto depMemType = cast<DependentMemberType>(association);
       CanType baseSubstType =
-        sourceConformance.getAssociatedType(sourceType, depMemType.getBase())
+        sourceConformance.getAssociatedType(depMemType.getBase())
           ->getCanonicalType();
       if (auto archetypeType = dyn_cast<ArchetypeType>(baseSubstType)) {
         AssociatedType baseAssocType(depMemType->getAssocType());