AST: Remove unnecessary canonicalization step in SubstitutionMap::lookupConformance()

Author: slavapestov

lib/AST/SubstitutionMap.cpp

@@ -124,9 +124,8 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
   if (!genericSig->conformsToProtocol(type, proto, mod))
     return None;
 
-  auto canonType = genericSig->getCanonicalTypeInContext(type, mod);
   auto accessPath =
-    genericSig->getConformanceAccessPath(canonType, proto, mod);
+    genericSig->getConformanceAccessPath(type, proto, mod);
 
   // Fall through because we cannot yet evaluate an access path.
   Optional<ProtocolConformanceRef> conformance;
@@ -153,7 +152,7 @@ SubstitutionMap::lookupConformance(CanType type, ProtocolDecl *proto) const {
 
     // If we haven't set the signature conformances yet, force the issue now.
     if (normal->getSignatureConformances().empty()) {
-      auto lazyResolver = canonType->getASTContext().getLazyResolver();
+      auto lazyResolver = type->getASTContext().getLazyResolver();
       lazyResolver->resolveTypeWitness(normal, nullptr);
 
       // Error case: the conformance is broken, so we cannot handle this