[CS] Split out element archetype handling in resolveType

Make sure we do this after we transform the type as otherwise we could
skip resolving type variables and let them escape.

Author: hamishknight

lib/Sema/CSDiagnostics.cpp

@@ -122,17 +122,17 @@ Type FailureDiagnostic::resolveType(Type rawType, bool reconstituteSugar,
           : resolvedType;
     }
 
-    if (type->hasElementArchetype()) {
-      auto *env = getDC()->getGenericEnvironmentOfContext();
-      return env->mapElementTypeIntoPackContext(type);
-    }
-
     if (type->isPlaceholder())
       return ErrorType::get(type->getASTContext());
 
     return std::nullopt;
   });
 
+  if (rawType->hasElementArchetype()) {
+    auto *env = getDC()->getGenericEnvironmentOfContext();
+    rawType = env->mapElementTypeIntoPackContext(rawType);
+  }
+
   if (reconstituteSugar)
     rawType = rawType->reconstituteSugar(/*recursive*/ true);
   return wantRValue ? rawType->getRValueType() : rawType;

validation-test/compiler_crashers_2/8a65840ca91fedd9.swift renamed to validation-test/compiler_crashers_2_fixed/8a65840ca91fedd9.swift

@@ -1,3 +1,3 @@
 // {"kind":"typecheck","signature":"swift::TypeChecker::typesSatisfyConstraint(swift::Type, swift::Type, bool, swift::constraints::ConstraintKind, swift::DeclContext*, bool*)","signatureAssert":"Assertion failed: (!type1->getRecursiveProperties().isSolverAllocated() && !type2->getRecursiveProperties().isSolverAllocated() && \"Cannot escape solver-allocated types into a nested ConstraintSystem\"), function typesSatisfyConstraint"}
-// RUN: not --crash %target-swift-frontend -typecheck %s
+// RUN: not %target-swift-frontend -typecheck %s
 func a<each b>(c : repeat each b) { repeat !(d c