Merge pull request #4390 from slavapestov/remove-primary-archetypes

AST: Remove GenericParamList::getPrimaryArchetypes(), NFC

Author: slavapestov

include/swift/AST/Decl.h

@@ -1213,18 +1213,6 @@ class GenericParamList final :
   ///
   /// This does not include archetypes from the outer generic parameter list(s).
   ArrayRef<ArchetypeType *> getAllArchetypes() const { return AllArchetypes; }
-
-  /// \brief Return the number of primary archetypes.
-  unsigned getNumPrimaryArchetypes() const {
-    return size();
-  }
-  
-  /// \brief Retrieves the list containing only the primary archetypes described
-  /// by this generic parameter clause. This excludes archetypes for associated
-  /// types of the primary archetypes.
-  ArrayRef<ArchetypeType *> getPrimaryArchetypes() const {
-    return getAllArchetypes().slice(0, getNumPrimaryArchetypes());
-  }
 
   /// \brief Sets all archetypes *without* copying the source array.
   void setAllArchetypes(ArrayRef<ArchetypeType *> AA) {
@@ -1236,20 +1224,12 @@ class GenericParamList final :
   using NestedArchetypeIterator
     = NestedGenericParamListIterator<ArchetypeType*,
                                      &GenericParamList::getAllArchetypes>;
-  using NestedGenericParamIterator
-    = NestedGenericParamListIterator<GenericTypeParamDecl*,
-                                     &GenericParamList::getParams>;
 
   /// \brief Retrieves a list containing all archetypes from this generic
   /// parameter clause and all outer generic parameter clauses in outer-to-
   /// inner order.
   iterator_range<NestedArchetypeIterator> getAllNestedArchetypes() const;
 
-  /// \brief Retrieves a list containing all generic parameter records from
-  /// this generic parameter clause and all outer generic parameter clauses in
-  /// outer-to-inner order.
-  iterator_range<NestedGenericParamIterator> getNestedGenericParams() const;
-  
   /// \brief Retrieve the outer generic parameter list, which provides the
   /// generic parameters of the context in which this generic parameter list
   /// exists.
@@ -1395,17 +1375,11 @@ class NestedGenericParamListIterator {
 };
 
 using NestedArchetypeIterator = GenericParamList::NestedArchetypeIterator;
-using NestedGenericParamIterator = GenericParamList::NestedGenericParamIterator;
 
 inline iterator_range<NestedArchetypeIterator>
 GenericParamList::getAllNestedArchetypes() const {
   return {NestedArchetypeIterator(this), NestedArchetypeIterator()};
 }
-  
-inline iterator_range<NestedGenericParamIterator>
-GenericParamList::getNestedGenericParams() const {
-  return {NestedGenericParamIterator(this), NestedGenericParamIterator()};
-}
 
 /// A trailing where clause.
 class alignas(RequirementRepr) TrailingWhereClause final :

lib/AST/ASTContext.cpp

@@ -801,9 +801,9 @@ static VarDecl *getPointeeProperty(VarDecl *&cache,
   // There must be a generic type with one argument.
   NominalTypeDecl *nominal = (ctx.*getNominal)();
   if (!nominal) return nullptr;
-  auto generics = nominal->getGenericParams();
-  if (!generics) return nullptr;
-  if (generics->size() != 1) return nullptr;
+  auto sig = nominal->getGenericSignature();
+  if (!sig) return nullptr;
+  if (sig->getGenericParams().size() != 1) return nullptr;
 
   // There must be a property named "pointee".
   auto identifier = ctx.getIdentifier("pointee");
@@ -813,7 +813,7 @@ static VarDecl *getPointeeProperty(VarDecl *&cache,
   // The property must have type T.
   VarDecl *property = dyn_cast<VarDecl>(results[0]);
   if (!property) return nullptr;
-  if (!property->getType()->isEqual(generics->getPrimaryArchetypes()[0]))
+  if (!property->getInterfaceType()->isEqual(sig->getGenericParams()[0]))
     return nullptr;
 
   cache = property;

lib/AST/ASTPrinter.cpp

@@ -4282,7 +4282,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
     // Substitute a context archetype if we have context generic params.
     if (Options.ContextGenericParams) {
       return visit(getGenericParamListAtDepth(T->getDepth())
-                     ->getPrimaryArchetypes()[T->getIndex()]);
+                     ->getParams()[T->getIndex()]->getArchetype());
     }
 
     auto Name = T->getName();

lib/AST/ArchetypeBuilder.cpp

@@ -2048,14 +2048,6 @@ Type ArchetypeBuilder::mapTypeIntoContext(Module *M,
         --skipLevels;
       }
 
-      // Return the archetype.
-      // FIXME: Use the allArchetypes vector instead of the generic param if
-      // available because of cross-module archetype serialization woes.
-      if (!myGenericParams->getAllArchetypes().empty())
-        return myGenericParams->getPrimaryArchetypes()[index];
-
-      // During type-checking, we may try to mapTypeIntoContext before
-      // AllArchetypes has been built, so fall back to the generic params.
       return myGenericParams->getParams()[index]->getArchetype();
     }
 

lib/PrintAsObjC/PrintAsObjC.cpp

@@ -1533,10 +1533,12 @@ class ObjCPrinter : private DeclVisitor<ObjCPrinter>,
 class ReferencedTypeFinder : private TypeVisitor<ReferencedTypeFinder> {
   friend TypeVisitor;
 
+  ModuleDecl &M;
   llvm::function_ref<void(ReferencedTypeFinder &, const TypeDecl *)> Callback;
   bool IsWithinConstrainedObjCGeneric = false;
 
-  ReferencedTypeFinder(decltype(Callback) callback) : Callback(callback) {}
+  ReferencedTypeFinder(ModuleDecl &mod, decltype(Callback) callback)
+    : M(mod), Callback(callback) {}
 
   void visitType(TypeBase *base) {
     llvm_unreachable("unhandled type");
@@ -1612,28 +1614,34 @@ class ReferencedTypeFinder : private TypeVisitor<ReferencedTypeFinder> {
 
   /// Returns true if \p archetype has any constraints other than being
   /// class-bound ("conforms to" AnyObject).
-  static bool isConstrainedArchetype(const ArchetypeType *archetype) {
-    if (archetype->getSuperclass())
+  static bool isConstrained(ModuleDecl &mod,
+                            GenericSignature *sig,
+                            GenericTypeParamType *paramTy) {
+    if (sig->getSuperclassBound(paramTy, mod))
       return true;
 
-    if (archetype->getConformsTo().size() > 1)
+    auto conformsTo = sig->getConformsTo(paramTy, mod);
+
+    if (conformsTo.size() > 1)
       return true;
-    if (archetype->getConformsTo().size() == 0)
+    if (conformsTo.size() == 0)
       return false;
 
-    const ProtocolDecl *proto = archetype->getConformsTo().front();
+    const ProtocolDecl *proto = conformsTo.front();
     if (auto knownKind = proto->getKnownProtocolKind())
       return knownKind.getValue() != KnownProtocolKind::AnyObject;
     return true;
   }
 
   void visitBoundGenericType(BoundGenericType *boundGeneric) {
-    bool isObjCGeneric = boundGeneric->getDecl()->hasClangNode();
+    auto *decl = boundGeneric->getDecl();
+    bool isObjCGeneric = decl->hasClangNode();
+    auto *sig = decl->getGenericSignature();
 
     for_each(boundGeneric->getGenericArgs(),
-             boundGeneric->getDecl()->getGenericParams()->getPrimaryArchetypes(),
-             [&](Type argTy, const ArchetypeType *archetype) {
-      if (isObjCGeneric && isConstrainedArchetype(archetype))
+             sig->getInnermostGenericParams(),
+             [&](Type argTy, GenericTypeParamType *paramTy) {
+      if (isObjCGeneric && isConstrained(M, sig, paramTy))
         IsWithinConstrainedObjCGeneric = true;
       visit(argTy);
       IsWithinConstrainedObjCGeneric = false;
@@ -1652,8 +1660,8 @@ class ReferencedTypeFinder : private TypeVisitor<ReferencedTypeFinder> {
     return IsWithinConstrainedObjCGeneric;
   }
 
-  static void walk(Type ty, decltype(Callback) callback) {
-    ReferencedTypeFinder(callback).visit(ty);
+  static void walk(ModuleDecl &mod, Type ty, decltype(Callback) callback) {
+    ReferencedTypeFinder(mod, callback).visit(ty);
   }
 };
 
@@ -1835,7 +1843,7 @@ class ModuleWriter {
       }
 
       bool needsToBeIndividuallyDelayed = false;
-      ReferencedTypeFinder::walk(VD->getType(),
+      ReferencedTypeFinder::walk(M, VD->getType(),
                                  [&](ReferencedTypeFinder &finder,
                                      const TypeDecl *TD) {
         if (TD == container)

lib/SIL/SILPrinter.cpp

@@ -1798,7 +1798,7 @@ void SILFunction::print(SILPrintContext &PrintCtx) const {
   llvm::SmallString<16> disambiguatedNameBuf;
   unsigned disambiguatedNameCounter = 1;
   while (params) {
-    for (ArchetypeType *param : params->getPrimaryArchetypes()) {
+    for (GenericTypeParamDecl *param : params->getParams()) {
       Identifier name = param->getName();
       while (!UsedNames.insert(name).second) {
         disambiguatedNameBuf.clear();
@@ -1809,7 +1809,7 @@ void SILFunction::print(SILPrintContext &PrintCtx) const {
         name = getASTContext().getIdentifier(disambiguatedNameBuf);
       }
       if (name != param->getName())
-        Aliases[CanType(param)] = name;
+        Aliases[CanType(param->getArchetype())] = name;
     }
 
     params = params->getOuterParameters();

lib/SILGen/SILGenDynamicCast.cpp

@@ -329,14 +329,14 @@ static RValue emitCollectionDowncastExpr(SILGenFunction &SGF,
   // This will have been diagnosed by the accessors above.
   if (!fn) return SGF.emitUndefRValue(loc, destType);
 
-  auto fnArcheTypes = fn->getGenericParams()->getPrimaryArchetypes();
+  auto fnGenericParams = fn->getGenericSignature()->getGenericParams();
   auto fromSubsts = fromCollection->gatherAllSubstitutions(
       SGF.SGM.SwiftModule, nullptr);
   auto toSubsts = toCollection->gatherAllSubstitutions(
       SGF.SGM.SwiftModule, nullptr);
-  assert(fnArcheTypes.size() == fromSubsts.size() + toSubsts.size() &&
+  assert(fnGenericParams.size() == fromSubsts.size() + toSubsts.size() &&
          "wrong number of generic collection parameters");
-  (void) fnArcheTypes;
+  (void) fnGenericParams;
 
   // Form type parameter substitutions.
   SmallVector<Substitution, 4> subs;

lib/SILGen/SILGenExpr.cpp

@@ -1000,14 +1000,14 @@ visitCollectionUpcastConversionExpr(CollectionUpcastConversionExpr *E,
   // This will have been diagnosed by the accessors above.
   if (!fn) return SGF.emitUndefRValue(E, E->getType());
 
-  auto fnArcheTypes = fn->getGenericParams()->getPrimaryArchetypes();
+  auto fnGenericParams = fn->getGenericParams()->getParams();
   auto fromSubsts = fromCollection->gatherAllSubstitutions(
       SGF.SGM.SwiftModule, nullptr);
   auto toSubsts = toCollection->gatherAllSubstitutions(
       SGF.SGM.SwiftModule, nullptr);
-  assert(fnArcheTypes.size() == fromSubsts.size() + toSubsts.size() &&
+  assert(fnGenericParams.size() == fromSubsts.size() + toSubsts.size() &&
          "wrong number of generic collection parameters");
-  (void) fnArcheTypes;
+  (void) fnGenericParams;
 
   // Form type parameter substitutions.
   SmallVector<Substitution, 4> subs;
@@ -1439,10 +1439,8 @@ VarargsInfo Lowering::emitBeginVarargs(SILGenFunction &gen, SILLocation loc,
                                        CanType baseTy, CanType arrayTy,
                                        unsigned numElements) {
   // Reabstract the base type against the array element type.
-  AbstractionPattern baseAbstraction(
-    arrayTy->getNominalOrBoundGenericNominal()
-           ->getGenericParams()->getPrimaryArchetypes()[0]);
-  
+  auto baseAbstraction = AbstractionPattern::getOpaque();
+
   // Allocate the array.
   SILValue numEltsVal = gen.B.createIntegerLiteral(loc,
                              SILType::getBuiltinWordType(gen.getASTContext()),