Consolidate get(Opaque|Opened)TypeArchetypeProperties into archetypeProperties()

Author: DougGregor

include/swift/AST/Types.h

@@ -6556,6 +6556,14 @@ class ArchetypeType : public SubstitutableType,
   }
 
 public:
+  /// Compute the recursive type properties for an archtype, merging the
+  /// given properties with those derived from the other arguments.
+  static RecursiveTypeProperties archetypeProperties(
+      RecursiveTypeProperties properties,
+      ArrayRef<ProtocolDecl *> conformsTo,
+      Type superclass,
+      SubstitutionMap subs);
+
   /// Retrieve the name of this archetype.
   Identifier getName() const;
 

lib/AST/ASTContext.cpp

@@ -5419,20 +5419,13 @@ DependentMemberType *DependentMemberType::get(Type base,
   return known;
 }
 
-/// Compute the recursive type properties of an opaque type archetype.
-static RecursiveTypeProperties getOpaqueTypeArchetypeProperties(
-    SubstitutionMap subs) {
-  RecursiveTypeProperties properties =
-    RecursiveTypeProperties::HasOpaqueArchetype;
-  properties |= subs.getRecursiveProperties();
-  return properties;
-}
-
 OpaqueTypeArchetypeType *OpaqueTypeArchetypeType::getNew(
     GenericEnvironment *environment, Type interfaceType,
     ArrayRef<ProtocolDecl *> conformsTo, Type superclass,
     LayoutConstraint layout) {
-  auto properties = getOpaqueTypeArchetypeProperties(
+  auto properties = archetypeProperties(
+      RecursiveTypeProperties::HasOpaqueArchetype,
+      conformsTo, superclass,
       environment->getOuterSubstitutions());
   auto arena = getArena(properties);
   auto size = OpaqueTypeArchetypeType::totalSizeToAlloc<
@@ -5451,19 +5444,12 @@ Type OpaqueTypeArchetypeType::get(
   return env->getOrCreateArchetypeFromInterfaceType(interfaceType);
 }
 
-/// Compute the recursive type properties of an opened existential archetype.
-static RecursiveTypeProperties getOpenedArchetypeProperties(SubstitutionMap subs) {
-  RecursiveTypeProperties properties =
-    RecursiveTypeProperties::HasOpenedExistential;
-  properties |= subs.getRecursiveProperties();
-  return properties;
-}
-
 CanTypeWrapper<OpenedArchetypeType> OpenedArchetypeType::getNew(
     GenericEnvironment *environment, Type interfaceType,
     ArrayRef<ProtocolDecl *> conformsTo, Type superclass,
     LayoutConstraint layout) {
-  auto properties = getOpenedArchetypeProperties(
+  auto properties = archetypeProperties(
+      RecursiveTypeProperties::HasOpenedExistential, conformsTo, superclass,
       environment->getOuterSubstitutions());
   auto arena = getArena(properties);
   auto size = OpenedArchetypeType::totalSizeToAlloc<
@@ -5658,7 +5644,8 @@ GenericEnvironment *GenericEnvironment::forOpaqueType(
 
   auto &ctx = opaque->getASTContext();
 
-  auto properties = getOpaqueTypeArchetypeProperties(subs);
+  auto properties = ArchetypeType::archetypeProperties(
+      RecursiveTypeProperties::HasOpaqueArchetype, { }, Type(), subs);
   auto arena = getArena(properties);
   auto &environments
     = ctx.getImpl().getArena(arena).OpaqueArchetypeEnvironments;
@@ -5706,7 +5693,11 @@ GenericEnvironment::forOpenedExistential(
 
   auto &ctx = existential->getASTContext();
 
-  auto properties = getOpenedArchetypeProperties(subs);
+  auto layout = existential->getExistentialLayout();
+  auto properties = ArchetypeType::archetypeProperties(
+      RecursiveTypeProperties::HasOpenedExistential,
+      layout.getProtocols(), layout.getSuperclass(), subs);
+
   auto arena = getArena(properties);
 
   auto key = std::make_pair(subs, uuid);

lib/AST/Type.cpp

@@ -3494,11 +3494,14 @@ std::string ArchetypeType::getFullName() const {
 }
 
 /// Determine the recursive type properties for an archetype.
-static RecursiveTypeProperties archetypeProperties(
+RecursiveTypeProperties ArchetypeType::archetypeProperties(
     RecursiveTypeProperties properties,
     ArrayRef<ProtocolDecl *> conformsTo,
-    Type superclass
+    Type superclass,
+    SubstitutionMap subs
 ) {
+  properties |= subs.getRecursiveProperties();
+
   for (auto proto : conformsTo) {
     if (proto->isUnsafe()) {
       properties |= RecursiveTypeProperties::IsUnsafe;
@@ -3538,7 +3541,7 @@ PrimaryArchetypeType::getNew(const ASTContext &Ctx,
 
   RecursiveTypeProperties Properties = archetypeProperties(
     RecursiveTypeProperties::HasPrimaryArchetype,
-    ConformsTo, Superclass);
+    ConformsTo, Superclass, SubstitutionMap());
   assert(!Properties.hasTypeVariable());
 
   auto arena = AllocationArena::Permanent;
@@ -3611,7 +3614,7 @@ PackArchetypeType::get(const ASTContext &Ctx,
   RecursiveTypeProperties properties = archetypeProperties(
     (RecursiveTypeProperties::HasPrimaryArchetype |
      RecursiveTypeProperties::HasPackArchetype),
-    ConformsTo, Superclass);
+    ConformsTo, Superclass, SubstitutionMap());
   assert(!properties.hasTypeVariable());
 
   auto arena = AllocationArena::Permanent;