AST: Clean up InFlightSubstitution::lookupConformance()

The special handling of DynamicSelfType should no longer be necessary
so I'm removing it.

Author: slavapestov

include/swift/AST/InFlightSubstitution.h

@@ -52,8 +52,7 @@ class InFlightSubstitution {
   Type substType(SubstitutableType *origType, unsigned level);
 
   /// Perform primitive conformance lookup on the given type.
-  ProtocolConformanceRef lookupConformance(CanType dependentType,
-                                           Type conformingReplacementType,
+  ProtocolConformanceRef lookupConformance(Type dependentType,
                                            ProtocolDecl *conformedProtocol,
                                            unsigned level);
 

lib/AST/ProtocolConformanceRef.cpp

@@ -111,9 +111,7 @@ ProtocolConformanceRef::subst(InFlightSubstitution &IFS) const {
 
   // Local conformance lookup into the substitution map.
   // FIXME: Pack element level?
-  return IFS.lookupConformance(origType->getCanonicalType(),
-                               origType.subst(IFS), proto,
-                               /*level=*/0);
+  return IFS.lookupConformance(origType, proto, /*level=*/0);
 }
 
 ProtocolConformanceRef ProtocolConformanceRef::mapConformanceOutOfContext() const {

lib/AST/SubstitutionMap.cpp

@@ -174,14 +174,12 @@ SubstitutionMap SubstitutionMap::get(GenericSignature genericSig,
   // Form the stored conformances.
   SmallVector<ProtocolConformanceRef, 4> conformances;
   for (const auto &req : genericSig.getRequirements()) {
-    if (req.getKind() != RequirementKind::Conformance) continue;
-
-    Type depTy = req.getFirstType();
-    auto replacement = depTy.subst(IFS);
-    auto *proto = req.getProtocolDecl();
-    auto conformance = IFS.lookupConformance(
-        depTy->getCanonicalType(), replacement, proto, /*level=*/0);
-    conformances.push_back(conformance);
+    if (req.getKind() != RequirementKind::Conformance)
+      continue;
+
+    conformances.push_back(
+      IFS.lookupConformance(
+        req.getFirstType(), req.getProtocolDecl(), /*level=*/0));
   }
 
   return SubstitutionMap(genericSig, types, conformances);

lib/AST/TypeSubstitution.cpp

@@ -273,13 +273,13 @@ Type InFlightSubstitution::substType(SubstitutableType *origType,
 }
 
 ProtocolConformanceRef
-InFlightSubstitution::lookupConformance(CanType dependentType,
-                                        Type conformingReplacementType,
+InFlightSubstitution::lookupConformance(Type dependentType,
                                         ProtocolDecl *conformedProtocol,
                                         unsigned level) {
-  auto substConfRef = BaselineLookupConformance(dependentType,
-                                                conformingReplacementType,
-                                                conformedProtocol);
+  auto substConfRef = BaselineLookupConformance(
+      dependentType->getCanonicalType(),
+      dependentType.subst(*this),
+      conformedProtocol);
   if (!substConfRef ||
       ActivePackExpansions.empty() ||
       !substConfRef.isPack())
@@ -430,22 +430,18 @@ Type TypeSubstituter::transformPackElementType(PackElementType *element,
 Type TypeSubstituter::transformDependentMemberType(DependentMemberType *dependent,
                                                    TypePosition pos) {
   auto origBase = dependent->getBase();
-  auto substBase = doIt(origBase, TypePosition::Invariant);
-
-  if (auto *selfType = substBase->getAs<DynamicSelfType>())
-    substBase = selfType->getSelfType();
 
   auto *assocType = dependent->getAssocType();
   ASSERT(assocType);
 
-  auto proto = assocType->getProtocol();
-  ProtocolConformanceRef conformance =
-    IFS.lookupConformance(origBase->getCanonicalType(), substBase,
-                          proto, level);
+  auto *proto = assocType->getProtocol();
+  auto conformance = IFS.lookupConformance(origBase, proto, level);
 
   auto result = conformance.getTypeWitness(assocType, IFS.getOptions());
-  if (result->is<ErrorType>())
+  if (result->is<ErrorType>()) {
+    auto substBase = origBase.subst(IFS);
     return DependentMemberType::get(ErrorType::get(substBase), assocType);
+  }
   return result;
 }