AST: Remove GenericEnvironment::containsPrimaryArchetype()

This is no longer necessary now that archetypes refer back to a
GenericEnvironment.

Author: slavapestov

include/swift/AST/GenericEnvironment.h

@@ -151,10 +151,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
     return Signature->getGenericParams();
   }
 
-  /// Determine whether this generic environment contains the given
-  /// primary archetype.
-  bool containsPrimaryArchetype(ArchetypeType *archetype) const;
-
   /// Create a new, "incomplete" generic environment that will be populated
   /// by calls to \c addMapping().
   static

lib/AST/ASTVerifier.cpp

@@ -170,11 +170,11 @@ struct LazyGenericEnvironment {
     if (isLazy()) return true;
 
     if (auto genericEnv = storage.dyn_cast<GenericEnvironment *>())
-      return genericEnv->containsPrimaryArchetype(archetype);
+      return archetype->getGenericEnvironment() == genericEnv;
 
     if (auto dc = storage.dyn_cast<DeclContext *>()) {
       if (auto genericEnv = dc->getGenericEnvironmentOfContext())
-        return genericEnv->containsPrimaryArchetype(archetype);
+        return archetype->getGenericEnvironment() == genericEnv;
     }
 
     return false;

lib/AST/GenericEnvironment.cpp

@@ -138,12 +138,6 @@ Optional<Type> GenericEnvironment::getMappingIfPresent(
   return None;
 }
 
-bool GenericEnvironment::containsPrimaryArchetype(
-                                              ArchetypeType *archetype) const {
-  return static_cast<bool>(
-                       QueryArchetypeToInterfaceSubstitutions(this)(archetype));
-}
-
 Type GenericEnvironment::mapTypeIntoContext(GenericEnvironment *env,
                                             Type type) {
   assert(!type->hasArchetype() && "already have a contextual type");

lib/SIL/SILVerifier.cpp

@@ -69,7 +69,7 @@ static bool isArchetypeValidInFunction(ArchetypeType *A, const SILFunction *F) {
   // Ok, we have a primary archetype, make sure it is in the nested generic
   // environment of our caller.
   if (auto *genericEnv = F->getGenericEnvironment())
-    if (genericEnv->containsPrimaryArchetype(A))
+    if (A->getGenericEnvironment() == genericEnv)
       return true;
 
   return false;

lib/Sema/CSDiag.cpp

@@ -8998,7 +8998,7 @@ static bool hasArchetype(const GenericTypeDecl *generic,
   if (!genericEnv)
     return false;
 
-  return genericEnv->containsPrimaryArchetype(archetype);
+  return archetype->getGenericEnvironment() == genericEnv;
 }
 
 static void noteArchetypeSource(const TypeLoc &loc, ArchetypeType *archetype,