[GenericEnvironment] Map shape types into context in PackArchetypeType::getShape.

Author: hborla

include/swift/AST/Types.h

@@ -6035,9 +6035,7 @@ class PackArchetypeType final
       LayoutConstraint Layout);
 
   // Returns the reduced shape type for this pack archetype.
-  Type getShape() const {
-    return getTrailingObjects<PackShape>()->shapeType;
-  }
+  Type getShape() const;
 
   static bool classof(const TypeBase *T) {
     return T->getKind() == TypeKind::PackArchetype;

lib/AST/Type.cpp

@@ -3992,6 +3992,11 @@ PackArchetypeType::get(const ASTContext &Ctx,
       {ShapeType}));
 }
 
+Type PackArchetypeType::getShape() const {
+  auto shapeType = getTrailingObjects<PackShape>()->shapeType;
+  return getGenericEnvironment()->mapTypeIntoContext(shapeType);
+}
+
 ElementArchetypeType::ElementArchetypeType(
     const ASTContext &Ctx, GenericEnvironment *GenericEnv, Type InterfaceType,
     ArrayRef<ProtocolDecl *> ConformsTo, Type Superclass,

lib/Sema/CSGen.cpp

@@ -2897,7 +2897,7 @@ namespace {
           return;
 
         if (auto archetype = type->getAs<PackArchetypeType>()) {
-          shapeType = CS.DC->mapTypeIntoContext(archetype->getShape());
+          shapeType = archetype->getShape();
         }
       });