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

Author: slavapestov

include/swift/AST/ProtocolConformanceRef.h

@@ -215,8 +215,7 @@ class ProtocolConformanceRef {
   /// Given a dependent type (expressed in terms of this conformance's
   /// protocol) and conformance, follow it from the conforming type.
   ProtocolConformanceRef
-  getAssociatedConformance(Type origType, Type dependentType,
-                           ProtocolDecl *requirement) const;
+  getAssociatedConformance(Type dependentType, ProtocolDecl *requirement) const;
 
   SWIFT_DEBUG_DUMP;
   void dump(llvm::raw_ostream &out, unsigned indent = 0,

lib/AST/PackConformance.cpp

@@ -151,16 +151,15 @@ PackConformance *PackConformance::getAssociatedConformance(
           assocTypePattern, packExpansion->getCountType()));
 
       auto assocConformancePattern =
-        conformances[i].getAssociatedConformance(packExpansion->getPatternType(),
-                                                 assocType, protocol);
+        conformances[i].getAssociatedConformance(assocType, protocol);
       packConformances.push_back(assocConformancePattern);
     } else {
       auto assocTypeScalar =
         conformances[i].getAssociatedType(packElement, assocType);
       packElements.push_back(assocTypeScalar);
 
       auto assocConformanceScalar =
-        conformances[i].getAssociatedConformance(packElement, assocType, protocol);
+        conformances[i].getAssociatedConformance(assocType, protocol);
       packConformances.push_back(assocConformanceScalar);
     }
   }

lib/AST/ProtocolConformanceRef.cpp

@@ -244,25 +244,26 @@ Type ProtocolConformanceRef::getAssociatedType(Type conformingType,
 }
 
 ProtocolConformanceRef
-ProtocolConformanceRef::getAssociatedConformance(Type conformingType,
-                                                 Type assocType,
+ProtocolConformanceRef::getAssociatedConformance(Type assocType,
                                                  ProtocolDecl *protocol) const {
+  if (isInvalid())
+    return *this;
+
   // If this is a pack conformance, project the associated conformances from
   // each pack element.
   if (isPack()) {
     auto *pack = getPack();
-    assert(conformingType->isEqual(pack->getType()));
     return ProtocolConformanceRef(
         pack->getAssociatedConformance(assocType, protocol));
   }
 
   // If this is a concrete conformance, project the associated conformance.
   if (isConcrete()) {
-    auto conformance = getConcrete();
-    assert(conformance->getType()->isEqual(conformingType));
-    return conformance->getAssociatedConformance(assocType, protocol);
+    return getConcrete()->getAssociatedConformance(assocType, protocol);
   }
 
+  auto conformingType = getType();
+
   auto computeSubjectType = [&](Type conformingType) -> Type {
     return assocType.transformRec(
       [&](TypeBase *t) -> std::optional<Type> {

lib/IRGen/GenProto.cpp

@@ -3454,8 +3454,7 @@ MetadataResponse MetadataPath::followComponent(IRGenFunction &IGF,
     sourceKey.Type = associatedType;
 
     auto associatedConformance =
-      sourceConformance.getAssociatedConformance(sourceType, association,
-                                                 associatedRequirement);
+      sourceConformance.getAssociatedConformance(association, associatedRequirement);
     sourceKey.Kind =
       LocalTypeDataKind::forProtocolWitnessTable(associatedConformance);
 

lib/SILGen/SILGenExpr.cpp

@@ -4152,7 +4152,6 @@ getOrCreateKeyPathEqualsAndHash(SILGenModule &SGM,
 
       // Get the Equatable conformance from the Hashable conformance.
       auto equatable = hashable.getAssociatedConformance(
-          formalTy,
           GenericTypeParamType::getType(/*depth*/ 0, /*index*/ 0, C),
           equatableProtocol);