Remove PartialGenericTypeToArchetypeResolver.

Author: DougGregor

lib/Sema/GenericTypeResolver.h

@@ -159,35 +159,6 @@ class GenericTypeToArchetypeResolver : public GenericTypeResolver {
   virtual void recordParamType(ParamDecl *decl, Type ty);
 };
 
-/// Generic type resolver that maps any generic type parameter type that
-/// has an underlying archetype to its corresponding archetype.
-///
-/// This generic type resolver replaces generic type parameter types that
-/// have archetypes with their archetypes, and leaves all other generic
-/// type parameter types unchanged. It is used for the initial type-checks of
-/// generic functions (and other generic declarations).
-///
-/// FIXME: This is not a long-term solution.
-class PartialGenericTypeToArchetypeResolver : public GenericTypeResolver {
-public:
-  virtual Type resolveGenericTypeParamType(GenericTypeParamType *gp);
-
-  virtual Type resolveDependentMemberType(Type baseTy,
-                                          DeclContext *DC,
-                                          SourceRange baseRange,
-                                          ComponentIdentTypeRepr *ref);
-
-  virtual Type resolveSelfAssociatedType(Type selfTy,
-                                         DeclContext *DC,
-                                         AssociatedTypeDecl *assocType);
-
-  virtual Type resolveTypeOfContext(DeclContext *dc, bool wantSelf=false);
-
-  virtual Type resolveTypeOfDecl(TypeDecl *decl);
-
-  virtual void recordParamType(ParamDecl *decl, Type ty);
-};
-
 /// Generic type resolver that performs complete resolution of dependent
 /// types based on a given archetype builder.
 ///

lib/Sema/TypeCheckGeneric.cpp

@@ -149,72 +149,6 @@ void GenericTypeToArchetypeResolver::recordParamType(ParamDecl *decl, Type type)
         type));
 }
 
-Type PartialGenericTypeToArchetypeResolver::resolveGenericTypeParamType(
-                                              GenericTypeParamType *gp) {
-  auto gpDecl = gp->getDecl();
-  if (!gpDecl)
-    return Type(gp);
-
-  // Hack: See parseGenericParameters(). When the issue there is fixed,
-  // we won't need the isInvalid() check anymore.
-  if (gpDecl->isInvalid())
-    return ErrorType::get(gpDecl->getASTContext());
-
-  if (!gpDecl->getDeclContext()->isValidGenericContext())
-    return Type(gp);
-
-  auto *genericEnv = gpDecl->getDeclContext()->getGenericEnvironmentOfContext();
-  return genericEnv->mapTypeIntoContext(gp);
-}
-
-Type PartialGenericTypeToArchetypeResolver::resolveDependentMemberType(
-                                              Type baseTy,
-                                              DeclContext *DC,
-                                              SourceRange baseRange,
-                                              ComponentIdentTypeRepr *ref) {
-  // We don't have enough information to find the associated type.
-  // FIXME: Nonsense, but we shouldn't need this code anyway.
-  return DependentMemberType::get(baseTy, ref->getIdentifier());
-}
-
-Type PartialGenericTypeToArchetypeResolver::resolveSelfAssociatedType(
-       Type selfTy,
-       DeclContext *DC,
-       AssociatedTypeDecl *assocType) {
-  // We don't have enough information to find the associated type.
-  // FIXME: Nonsense, but we shouldn't need this code anyway.
-  return DependentMemberType::get(selfTy, assocType);
-}
-
-Type
-PartialGenericTypeToArchetypeResolver::resolveTypeOfContext(DeclContext *dc,
-                                                            bool wantSelf) {
-  if (dc->isGenericContext() && dc->isValidGenericContext())
-    return dc->mapTypeIntoContext(getTypeOfContext(dc, wantSelf));
-  return getTypeOfContext(dc, wantSelf);
-}
-
-Type
-PartialGenericTypeToArchetypeResolver::resolveTypeOfDecl(TypeDecl *decl) {
-  // Hack for 'out of context' GenericTypeParamDecls when resolving
-  // a generic typealias
-  if (auto *paramDecl = dyn_cast<GenericTypeParamDecl>(decl)) {
-    return decl->getDeclContext()->getGenericEnvironmentOfContext()
-        ->mapTypeIntoContext(paramDecl->getDeclaredInterfaceType()
-            ->castTo<GenericTypeParamType>());
-  }
-
-  auto *aliasDecl = cast<TypeAliasDecl>(decl);
-  if (aliasDecl->isInvalid())
-    return ErrorType::get(aliasDecl->getASTContext());
-  return aliasDecl->getAliasType();
-}
-
-void
-PartialGenericTypeToArchetypeResolver::recordParamType(ParamDecl *decl, Type type) {
-  // Do nothing
-}
-
 Type CompleteGenericTypeResolver::resolveGenericTypeParamType(
                                               GenericTypeParamType *gp) {
   auto gpDecl = gp->getDecl();