Merge pull request #66597 from hborla/5.9-generic-env-context-substitutions

[5.9][GenericEnvironment] Don't apply outer context substitutions before `type.subst` in `mapTypeIntoContext`.

Author: hborla

lib/AST/GenericEnvironment.cpp

@@ -635,7 +635,6 @@ Type GenericEnvironment::mapTypeIntoContext(
   assert((!type->hasArchetype() || type->hasLocalArchetype()) &&
          "already have a contextual type");
 
-  type = maybeApplyOuterContextSubstitutions(type);
   Type result = type.subst(QueryInterfaceTypeSubstitutions(this),
                            lookupConformance,
                            SubstFlags::AllowLoweredTypes |

test/Constraints/pack-expansion-expressions.swift

@@ -552,3 +552,11 @@ do {
     _ = (repeat overloaded(1, each a))
   }
 }
+
+func configure<T, each Element>(
+  _ item: T,
+  with configuration: repeat (ReferenceWritableKeyPath<T, each Element>, each Element)
+) -> T {
+  repeat item[keyPath: (each configuration).0] = (each configuration).1
+  return item
+}