SIL: Sink local archetype substitution into remapASTType()

Author: slavapestov

include/swift/SIL/SILCloner.h

@@ -238,14 +238,6 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   }
 
   CanType getOpASTType(CanType ty) {
-    // Substitute local archetypes, if we have any.
-    if (ty->hasLocalArchetype() && !LocalArchetypeSubs.empty()) {
-      ty = ty.subst(
-            QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-            MakeAbstractConformanceForGenericType()
-          )->getCanonicalType();
-    }
-
     return asImpl().remapASTType(ty);
   }
 
@@ -450,8 +442,16 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
       return Ty;
   }
 
-  CanType remapASTType(CanType Ty) {
-    return Ty;
+  CanType remapASTType(CanType ty) {
+    // Substitute local archetypes, if we have any.
+    if (ty->hasLocalArchetype() && !LocalArchetypeSubs.empty()) {
+      ty = ty.subst(
+            QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
+            MakeAbstractConformanceForGenericType()
+          )->getCanonicalType();
+    }
+
+    return ty;
   }
 
   ProtocolConformanceRef remapConformance(Type Ty, ProtocolConformanceRef C) {

include/swift/SIL/TypeSubstCloner.h

@@ -182,16 +182,17 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
   }
 
   CanType remapASTType(CanType ty) {
-    auto substTy = ty.subst(SubsMap)->getCanonicalType();
+    auto substTy = ty.subst(Functor, Functor)->getCanonicalType();
+
+    auto context = getBuilder().getTypeExpansionContext();
+
     if (!substTy->hasOpaqueArchetype() ||
-        !getBuilder().getTypeExpansionContext()
-            .shouldLookThroughOpaqueTypeArchetypes())
+        !context.shouldLookThroughOpaqueTypeArchetypes())
       return substTy;
+
     // Remap types containing opaque result types in the current context.
-    return substOpaqueTypesWithUnderlyingTypes(
-        substTy,
-        TypeExpansionContext(getBuilder().getFunction()),
-        /*allowLoweredTypes=*/false);
+    return substOpaqueTypesWithUnderlyingTypes(substTy, context,
+                                               /*allowLoweredTypes=*/false);
   }
 
   ProtocolConformanceRef remapConformance(Type ty,

lib/SILOptimizer/IPO/CrossModuleOptimization.cpp

@@ -138,6 +138,9 @@ class InstructionVisitor : public SILCloner<InstructionVisitor> {
   }
 
   CanType remapASTType(CanType Ty) {
+    if (Ty->hasLocalArchetype())
+      Ty = Ty.subst(Functor, Functor)->getCanonicalType();
+
     CMS.makeTypeUsableFromInline(Ty);
     return Ty;
   }

lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp

@@ -52,6 +52,10 @@ class MapOpaqueArchetypes : public SILCloner<MapOpaqueArchetypes> {
   }
 
   CanType remapASTType(CanType ty) {
+    // Substitute local archetypes, if we have any.
+    if (ty->hasLocalArchetype())
+      ty = ty.subst(Functor, Functor)->getCanonicalType();
+
     if (!ty->hasOpaqueArchetype() ||
         !getBuilder()
              .getTypeExpansionContext()