[Type checker] Eliminate SIL parser's use of PartialGenericTypeToArchetypeResolver.

Author: DougGregor

lib/Sema/TypeCheckDecl.cpp

@@ -732,11 +732,18 @@ TypeChecker::handleSILGenericParams(GenericParamList *genericParams,
     revertGenericParamList(genericParams);
 
     ArchetypeBuilder builder(*DC->getParentModule());
+    CompleteGenericTypeResolver completeResolver(*this, builder);
     checkGenericParamList(&builder, genericParams, parentSig, parentEnv,
-                          nullptr);
+                          &completeResolver);
     parentSig = genericSig;
     parentEnv = builder.getGenericEnvironment(parentSig);
     recordArchetypeContexts(parentSig, parentEnv, DC);
+
+    // Compute the final set of archetypes.
+    revertGenericParamList(genericParams);
+    GenericTypeToArchetypeResolver archetypeResolver(parentEnv);
+    checkGenericParamList(nullptr, genericParams, parentSig, parentEnv,
+                          &archetypeResolver);
   }
 
   return parentEnv;

lib/Sema/TypeChecker.h

@@ -726,7 +726,7 @@ class TypeChecker final : public LazyResolver {
   /// \param options Options that alter type resolution.
   ///
   /// \param resolver A resolver for generic types. If none is supplied, this
-  /// routine will create a \c PartialGenericTypeToArchetypeResolver to use.
+  /// routine will create a \c GenericTypeToArchetypeResolver to use.
   ///
   /// \returns true if type validation failed, or false otherwise.
   bool validateType(TypeLoc &Loc, DeclContext *DC,
@@ -756,7 +756,7 @@ class TypeChecker final : public LazyResolver {
   /// \param options Options that alter type resolution.
   ///
   /// \param resolver A resolver for generic types. If none is supplied, this
-  /// routine will create a \c PartialGenericTypeToArchetypeResolver to use.
+  /// routine will create a \c GenericTypeToArchetypeResolver to use.
   ///
   /// \param unsatisfiedDependency When non-null, used to check whether
   /// dependencies have been satisfied appropriately.