SIL: Simplify MapOpaqueArchetypes

Author: slavapestov

lib/SILOptimizer/UtilityPasses/SerializeSILPass.cpp

@@ -40,56 +40,7 @@ class MapOpaqueArchetypes : public SILCloner<MapOpaqueArchetypes> {
     clonedEntryBlock = fun.createBasicBlock();
   }
 
-  SILType remapType(SILType Ty) {
-    // Substitute local archetypes, if we have any.
-    if (Ty.hasLocalArchetype()) {
-      Ty = Ty.subst(getBuilder().getModule(), Functor, Functor,
-                    CanGenericSignature());
-    }
-
-    if (!Ty.hasOpaqueArchetype() ||
-        !getBuilder()
-             .getTypeExpansionContext()
-             .shouldLookThroughOpaqueTypeArchetypes())
-      return Ty;
-
-    return getBuilder().getTypeLowering(Ty).getLoweredType().getCategoryType(
-        Ty.getCategory());
-  }
-
-  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()
-             .shouldLookThroughOpaqueTypeArchetypes())
-      return ty;
-
-    return substOpaqueTypesWithUnderlyingTypes(
-        ty,
-        TypeExpansionContext(getBuilder().getFunction()),
-        /*allowLoweredTypes=*/false);
-  }
-
-  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();
-    if (ty->hasOpaqueArchetype() &&
-        context.shouldLookThroughOpaqueTypeArchetypes()) {
-      conf =
-          substOpaqueTypesWithUnderlyingTypes(conf, ty, context);
-    }
-    return conf;
-  }
+  bool shouldSubstOpaqueArchetypes() const { return true; }
 
   void replace();
 };

test/SILOptimizer/specialize_opaque_result_types2.sil

@@ -35,9 +35,9 @@ bb0(%0 : $*T):
   return %5 : $@callee_owned () -> @out T       // id: %7
 }
 
-// CHECK-LABEL: sil shared [noinline] @$s17getGenericClosure1A19exportsOpaqueReturnQryFQOyQo__Tg5 : $@convention(thin) (Int) -> @owned @callee_owned () -> @out Int {
+// CHECK-LABEL: sil shared [noinline] @$s17getGenericClosureSi_Tg5 : $@convention(thin) (Int) -> @owned @callee_owned () -> @out Int {
 // CHECK:  alloc_box $<τ_0_0> { var τ_0_0 } <Int>
-// CHECK: } // end sil function '$s17getGenericClosure1A19exportsOpaqueReturnQryFQOyQo__Tg5'
+// CHECK: } // end sil function '$s17getGenericClosureSi_Tg5'
 
 sil [transparent] [serialized] @specializePartialApplies : $@convention(thin) (@in SomeButt) -> () {
 bb0(%0 : $*SomeButt):