Merge pull request #79917 from eeckstein/rename-opened-archetype-type

AST: rename OpenArchetypeType -> ExistentialArchetypeType

Author: eeckstein

docs/Generics/chapters/types.tex

@@ -759,7 +759,7 @@ \section{Source Code Reference}\label{typesourceref}
 \item \texttt{ArchetypeType}, and its three subclasses:
 \begin{itemize}
 \item \texttt{PrimaryArchetypeType},
-\item \texttt{OpenedArchetypeType},
+\item \texttt{ExistentialArchetypeType},
 \item \texttt{OpaqueArchetypeType}.
 \end{itemize}
 \item The abstract types:

include/swift/AST/ASTBridgingImpl.h

@@ -403,7 +403,7 @@ bool BridgedASTType::hasLocalArchetype() const {
 }
 
 bool BridgedASTType::isExistentialArchetype() const {
-  return unbridged()->is<swift::OpenedArchetypeType>();
+  return unbridged()->is<swift::ExistentialArchetypeType>();
 }
 
 bool BridgedASTType::isExistentialArchetypeWithError() const {

include/swift/AST/Expr.h

@@ -51,7 +51,7 @@ namespace swift {
   class ValueDecl;
   class Decl;
   class DeclRefExpr;
-  class OpenedArchetypeType;
+  class ExistentialArchetypeType;
   class ParamDecl;
   class Pattern;
   class SubscriptDecl;
@@ -3013,7 +3013,7 @@ class OpenExistentialExpr : public Expr {
 
   /// Retrieve the opened archetype, which can only be referenced
   /// within this expression's subexpression.
-  OpenedArchetypeType *getOpenedArchetype() const;
+  ExistentialArchetypeType *getOpenedArchetype() const;
 
   static bool classof(const Expr *E) {
     return E->getKind() == ExprKind::OpenExistential;

include/swift/AST/GenericEnvironment.h

@@ -36,7 +36,7 @@ class ASTContext;
 class GenericTypeParamType;
 class OpaqueTypeDecl;
 class ElementArchetypeType;
-class OpenedArchetypeType;
+class ExistentialArchetypeType;
 class PackArchetypeType;
 class PackExpansionType;
 class SILModule;

include/swift/AST/TypeMatcher.h

@@ -310,7 +310,7 @@ class TypeMatcher {
         }
       }
 
-      // FIXME: Once OpenedArchetypeType stores substitutions, do something
+      // FIXME: Once ExistentialArchetypeType stores substitutions, do something
       // similar to the above.
 
       if (firstArchetype->isEqual(secondType))

include/swift/AST/TypeNodes.def

@@ -179,9 +179,9 @@ ABSTRACT_TYPE(Substitutable, Type)
     ALWAYS_CANONICAL_TYPE(PrimaryArchetype, ArchetypeType)
     ALWAYS_CANONICAL_TYPE(OpaqueTypeArchetype, ArchetypeType)
     ABSTRACT_TYPE(LocalArchetype, ArchetypeType)
-      ALWAYS_CANONICAL_TYPE(OpenedArchetype, LocalArchetypeType)
+      ALWAYS_CANONICAL_TYPE(ExistentialArchetype, LocalArchetypeType)
       ALWAYS_CANONICAL_TYPE(ElementArchetype, LocalArchetypeType)
-      TYPE_RANGE(LocalArchetype, OpenedArchetype, ElementArchetype)
+      TYPE_RANGE(LocalArchetype, ExistentialArchetype, ElementArchetype)
     ALWAYS_CANONICAL_TYPE(PackArchetype, ArchetypeType)
     TYPE_RANGE(Archetype, PrimaryArchetype, PackArchetype)
   TYPE(GenericTypeParam, SubstitutableType)

include/swift/AST/TypeTransform.h

@@ -165,7 +165,7 @@ case TypeKind::Id:
                                           newSubMap);
     }
 
-    case TypeKind::OpenedArchetype: {
+    case TypeKind::ExistentialArchetype: {
       auto *local = cast<LocalArchetypeType>(base);
       if (auto result = asDerived().transformLocalArchetypeType(local, pos))
         return *result;

include/swift/AST/Types.h

@@ -75,7 +75,7 @@ class GenericSignatureBuilder;
 class Identifier;
 class InOutType;
 class OpaqueTypeDecl;
-class OpenedArchetypeType;
+class ExistentialArchetypeType;
 class PackExpansionType;
 class PackType;
 enum class ParamSpecifier : uint8_t;
@@ -114,6 +114,9 @@ enum class TypeKind : uint8_t {
 #define TYPE_RANGE(Id, FirstId, LastId) \
   First_##Id##Type = FirstId, Last_##Id##Type = LastId,
 #include "swift/AST/TypeNodes.def"
+  // For backward compatibility in LLDB sources.
+  // TODO: remove this once OpenedArchetype is renamed in LLDB sources.
+  OpenedArchetype = ExistentialArchetype
 };
 
 enum : unsigned {
@@ -6971,16 +6974,16 @@ class LocalArchetypeType : public ArchetypeType {
 
 public:
   static bool classof(const TypeBase *type) {
-    return type->getKind() == TypeKind::OpenedArchetype ||
+    return type->getKind() == TypeKind::ExistentialArchetype ||
            type->getKind() == TypeKind::ElementArchetype;
   }
 };
 BEGIN_CAN_TYPE_WRAPPER(LocalArchetypeType, ArchetypeType)
 END_CAN_TYPE_WRAPPER(LocalArchetypeType, ArchetypeType)
 
 /// An archetype that represents the dynamic type of an opened existential.
-class OpenedArchetypeType final : public LocalArchetypeType,
-    private ArchetypeTrailingObjects<OpenedArchetypeType>
+class ExistentialArchetypeType final : public LocalArchetypeType,
+    private ArchetypeTrailingObjects<ExistentialArchetypeType>
 {
   friend TrailingObjects;
   friend ArchetypeType;
@@ -6991,7 +6994,7 @@ class OpenedArchetypeType final : public LocalArchetypeType,
   ///
   /// This is only invoked by the generic environment when mapping the
   /// interface type into context.
-  static CanTypeWrapper<OpenedArchetypeType>
+  static CanTypeWrapper<ExistentialArchetypeType>
   getNew(GenericEnvironment *environment, Type interfaceType,
          ArrayRef<ProtocolDecl *> conformsTo, Type superclass,
          LayoutConstraint layout);
@@ -7001,7 +7004,7 @@ class OpenedArchetypeType final : public LocalArchetypeType,
   /// of an existential value.
   ///
   /// \param existential The existential type to open.
-  static CanTypeWrapper<OpenedArchetypeType> get(CanType existential);
+  static CanTypeWrapper<ExistentialArchetypeType> get(CanType existential);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
@@ -7014,18 +7017,18 @@ class OpenedArchetypeType final : public LocalArchetypeType,
   static Type getAny(Type existential);
 
   static bool classof(const TypeBase *T) {
-    return T->getKind() == TypeKind::OpenedArchetype;
+    return T->getKind() == TypeKind::ExistentialArchetype;
   }
 
 private:
-  OpenedArchetypeType(GenericEnvironment *environment, Type interfaceType,
+  ExistentialArchetypeType(GenericEnvironment *environment, Type interfaceType,
                       ArrayRef<ProtocolDecl *> conformsTo,
                       Type superclass,
                       LayoutConstraint layout,
                       RecursiveTypeProperties properties);
 };
-BEGIN_CAN_TYPE_WRAPPER(OpenedArchetypeType, LocalArchetypeType)
-END_CAN_TYPE_WRAPPER(OpenedArchetypeType, LocalArchetypeType)
+BEGIN_CAN_TYPE_WRAPPER(ExistentialArchetypeType, LocalArchetypeType)
+END_CAN_TYPE_WRAPPER(ExistentialArchetypeType, LocalArchetypeType)
 
 /// A wrapper around a shape type to use in ArchetypeTrailingObjects
 /// for PackArchetypeType.
@@ -7111,7 +7114,7 @@ const Type *ArchetypeType::getSubclassTrailingObjects() const {
   if (auto opaqueTy = dyn_cast<OpaqueTypeArchetypeType>(this)) {
     return opaqueTy->getTrailingObjects<Type>();
   }
-  if (auto openedTy = dyn_cast<OpenedArchetypeType>(this)) {
+  if (auto openedTy = dyn_cast<ExistentialArchetypeType>(this)) {
     return openedTy->getTrailingObjects<Type>();
   }
   if (auto childTy = dyn_cast<PackArchetypeType>(this)) {

include/swift/SIL/SILCloner.h

@@ -383,7 +383,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
     return numScalarElements == 1;
   }
 
-  void remapRootOpenedType(CanOpenedArchetypeType archetypeTy) {
+  void remapRootOpenedType(CanExistentialArchetypeType archetypeTy) {
     auto *origEnv = archetypeTy->getGenericEnvironment();
 
     auto genericSig = origEnv->getGenericSignature();

include/swift/SIL/SILInstruction.h

@@ -7773,7 +7773,7 @@ class OpenExistentialAddrInst
 
   OpenedExistentialAccess getAccessKind() const { return ForAccess; }
 
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");
@@ -7794,7 +7794,7 @@ class OpenExistentialValueInst
                            ValueOwnershipKind forwardingOwnershipKind);
 
 public:
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");
@@ -7815,7 +7815,7 @@ class OpenExistentialRefInst
                          ValueOwnershipKind forwardingOwnershipKind);
 
 public:
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");
@@ -7837,7 +7837,7 @@ class OpenExistentialMetatypeInst
                               SILType ty);
 
 public:
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");
@@ -7858,7 +7858,7 @@ class OpenExistentialBoxInst
                          SILType ty);
 
 public:
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");
@@ -7879,7 +7879,7 @@ class OpenExistentialBoxValueInst
                               ValueOwnershipKind forwardingOwnershipKind);
 
 public:
-  CanOpenedArchetypeType getDefinedOpenedArchetype() const {
+  CanExistentialArchetypeType getDefinedOpenedArchetype() const {
     const auto archetype = getOpenedArchetypeOf(getType().getASTType());
     assert(archetype && archetype->isRoot() &&
            "Type should be a root opened archetype");