SIL: Handle captured environments in SILFunction::mapTypeIntoContext()

Author: slavapestov

lib/SIL/IR/SILFunction.cpp

@@ -16,6 +16,7 @@
 #include "swift/AST/Availability.h"
 #include "swift/AST/Expr.h"
 #include "swift/AST/GenericEnvironment.h"
+#include "swift/AST/LocalArchetypeRequirementCollector.h"
 #include "swift/AST/Module.h"
 #include "swift/AST/Stmt.h"
 #include "swift/Basic/OptimizationMode.h"
@@ -490,24 +491,43 @@ bool SILFunction::shouldOptimize() const {
 }
 
 Type SILFunction::mapTypeIntoContext(Type type) const {
-  return GenericEnvironment::mapTypeIntoContext(
-      getGenericEnvironment(), type);
+  assert(!type->hasPrimaryArchetype());
+
+  if (GenericEnv) {
+    return type.subst(MapIntoLocalArchetypeContext(GenericEnv, CapturedEnvs),
+                      LookUpConformanceInModule(Module.getSwiftModule()),
+                      SubstFlags::AllowLoweredTypes |
+                      SubstFlags::PreservePackExpansionLevel);
+  }
+
+  assert(!type->hasTypeParameter());
+  return type;
 }
 
 SILType SILFunction::mapTypeIntoContext(SILType type) const {
-  if (auto *genericEnv = getGenericEnvironment())
-    return genericEnv->mapTypeIntoContext(getModule(), type);
+  assert(!type.hasPrimaryArchetype());
+
+  if (GenericEnv) {
+    auto genericSig = GenericEnv->getGenericSignature().getCanonicalSignature();
+    return type.subst(Module,
+                      MapIntoLocalArchetypeContext(GenericEnv, CapturedEnvs),
+                      LookUpConformanceInModule(Module.getSwiftModule()),
+                      genericSig,
+                      SubstFlags::PreservePackExpansionLevel);
+  }
+
+  assert(!type.hasTypeParameter());
   return type;
 }
 
 SILType GenericEnvironment::mapTypeIntoContext(SILModule &M,
                                                SILType type) const {
-  assert(!type.hasArchetype());
+  assert(!type.hasPrimaryArchetype());
 
   auto genericSig = getGenericSignature().getCanonicalSignature();
   return type.subst(M,
                     QueryInterfaceTypeSubstitutions(this),
-                    LookUpConformanceInSignature(genericSig.getPointer()),
+                    LookUpConformanceInModule(M.getSwiftModule()),
                     genericSig,
                     SubstFlags::PreservePackExpansionLevel);
 }