SIL: Sink local archetype substitution into remapConformance()

Author: slavapestov

include/swift/SIL/SILCloner.h

@@ -79,7 +79,6 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   SILBuilder Builder;
   DominanceInfo *DomTree = nullptr;
   SubstitutionMapWithLocalArchetypes Functor;
-  TypeSubstitutionMap &LocalArchetypeSubs;
 
   // The old-to-new value map.
   llvm::DenseMap<SILValue, SILValue> ValueMap;
@@ -106,10 +105,10 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   using SILInstructionVisitor<ImplClass>::asImpl;
 
   explicit SILCloner(SILFunction &F, DominanceInfo *DT = nullptr)
-      : Builder(F), DomTree(DT), LocalArchetypeSubs(Functor.LocalArchetypeSubs) {}
+      : Builder(F), DomTree(DT) {}
 
   explicit SILCloner(SILGlobalVariable *GlobVar)
-      : Builder(GlobVar), LocalArchetypeSubs(Functor.LocalArchetypeSubs) {}
+      : Builder(GlobVar) {}
 
   void clearClonerState() {
     ValueMap.clear();
@@ -198,7 +197,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   /// Register a re-mapping for local archetypes such as opened existentials.
   void registerLocalArchetypeRemapping(ArchetypeType *From,
                                        ArchetypeType *To) {
-    auto result = LocalArchetypeSubs.insert(
+    auto result = Functor.LocalArchetypeSubs.insert(
         std::make_pair(CanArchetypeType(From), CanType(To)));
     assert(result.second);
     (void)result;
@@ -336,17 +335,6 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
 
   ProtocolConformanceRef getOpConformance(Type ty,
                                           ProtocolConformanceRef conformance) {
-    // If we have local archetypes to substitute, do so now.
-    if (ty->hasLocalArchetype() && !LocalArchetypeSubs.empty()) {
-      conformance =
-        conformance.subst(ty,
-                          QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-                          MakeAbstractConformanceForGenericType());
-      ty = ty.subst(
-            QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-            MakeAbstractConformanceForGenericType());
-    }
-
     return asImpl().remapConformance(ty, conformance);
   }
 
@@ -448,8 +436,13 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
   }
 
   ProtocolConformanceRef remapConformance(Type Ty, ProtocolConformanceRef C) {
+    // If we have local archetypes to substitute, do so now.
+    if (Ty->hasLocalArchetype())
+      C = C.subst(Ty, Functor, Functor);
+
     return C;
   }
+
   /// Get the value that takes the place of the given `Value` within the cloned
   /// region. The given value must already have been mapped by this cloner.
   SILValue getMappedValue(SILValue Value);

include/swift/SIL/TypeSubstCloner.h

@@ -148,7 +148,6 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
   using SILClonerWithScopes<ImplClass>::getOpBasicBlock;
   using SILClonerWithScopes<ImplClass>::recordClonedInstruction;
   using SILClonerWithScopes<ImplClass>::recordFoldedValue;
-  using SILClonerWithScopes<ImplClass>::LocalArchetypeSubs;
   using SILClonerWithScopes<ImplClass>::Functor;
 
   TypeSubstCloner(SILFunction &To,
@@ -201,15 +200,16 @@ class TypeSubstCloner : public SILClonerWithScopes<ImplClass> {
 
   ProtocolConformanceRef remapConformance(Type ty,
                                           ProtocolConformanceRef conf) {
-    auto conformance = conf.subst(ty, SubsMap);
-    auto substTy = ty.subst(SubsMap)->getCanonicalType();
+    auto substTy = ty.subst(Functor, Functor)->getCanonicalType();
+    auto substConf = conf.subst(ty, Functor, Functor);
+
     auto context = getBuilder().getTypeExpansionContext();
-    if (substTy->hasOpaqueArchetype() &&
-        context.shouldLookThroughOpaqueTypeArchetypes()) {
-      conformance =
-          substOpaqueTypesWithUnderlyingTypes(conformance, substTy, context);
-    }
-    return conformance;
+
+    if (!substTy->hasOpaqueArchetype() ||
+        !context.shouldLookThroughOpaqueTypeArchetypes())
+      return substConf;
+
+    return substOpaqueTypesWithUnderlyingTypes(substConf, substTy, context);
   }
 
   SubstitutionMap remapSubstitutionMap(SubstitutionMap Subs) {

lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp

@@ -76,14 +76,19 @@ class MapOpaqueArchetypes : public SILCloner<MapOpaqueArchetypes> {
 
   ProtocolConformanceRef remapConformance(Type ty,
                                           ProtocolConformanceRef conf) {
+    // If we have local archetypes to substitute, do so now.
+    if (ty->hasLocalArchetype()) {
+      conf = conf.subst(ty, Functor, Functor);
+      ty = ty.subst(Functor, Functor);
+    }
+
     auto context = getBuilder().getTypeExpansionContext();
-    auto conformance = conf;
     if (ty->hasOpaqueArchetype() &&
         context.shouldLookThroughOpaqueTypeArchetypes()) {
-      conformance =
-          substOpaqueTypesWithUnderlyingTypes(conformance, ty, context);
+      conf =
+          substOpaqueTypesWithUnderlyingTypes(conf, ty, context);
     }
-    return conformance;
+    return conf;
   }
 
   void replace();