SILGen: Minimal backport of SILCloner changes on main

Author: slavapestov

lib/SILGen/SILGenLocalArchetype.cpp

@@ -32,6 +32,7 @@ class LocalArchetypeTransform : public SILCloner<LocalArchetypeTransform> {
 
   GenericSignatureWithCapturedEnvironments sig;
   GenericEnvironment *env;
+  SubstitutionMap subs;
 
 public:
   LocalArchetypeTransform(SILFunction *F,
@@ -43,7 +44,7 @@ class LocalArchetypeTransform : public SILCloner<LocalArchetypeTransform> {
     // The primary archetypes of the old generic environment map to
     // primary archetypes of the new generic environment at the same
     // index and depth.
-    Functor.SubsMap = env->getForwardingSubstitutionMap();
+    subs = env->getForwardingSubstitutionMap();
 
     // Local archetypes map to generic parameters at higher depths.
     MapLocalArchetypesOutOfContext mapOutOfContext(sig.baseGenericSig,
@@ -74,6 +75,22 @@ class LocalArchetypeTransform : public SILCloner<LocalArchetypeTransform> {
     }
   }
 
+  SILType remapType(SILType Ty) {
+    return Ty.subst(Builder.getModule().Types, subs);
+  }
+
+  CanType remapASTType(CanType ty) {
+    return ty.subst(subs)->getCanonicalType();
+  }
+
+  ProtocolConformanceRef remapConformance(Type Ty, ProtocolConformanceRef C) {
+    return C.subst(Ty, subs);
+  }
+
+  SubstitutionMap remapSubstitutionMap(SubstitutionMap subMap) {
+    return subMap.subst(subs);
+  }
+
   void doIt() {
     auto &F = getBuilder().getFunction();
 
@@ -146,4 +163,4 @@ void SILGenModule::recontextualizeCapturedLocalArchetypes(
 
   LocalArchetypeTransform(F, sig).doIt();
   M.reclaimUnresolvedLocalArchetypeDefinitions();
-}
+}