AST: Remove TypeBase::openAnyExistentialType()

Author: slavapestov

include/swift/AST/Types.h

@@ -911,9 +911,6 @@ class alignas(1 << TypeAlignInBits) TypeBase
   /// bound.
   bool isClassExistentialType();
 
-  /// Opens an existential instance or meta-type and returns the opened type.
-  Type openAnyExistentialType(OpenedArchetypeType *&opened);
-
   /// Break an existential down into a set of constraints.
   ExistentialLayout getExistentialLayout();
 
@@ -6835,7 +6832,7 @@ class OpenedArchetypeType final : public LocalArchetypeType,
   ///
   /// \param existential The existential type or existential metatype to open.
   /// \param interfaceType The interface type represented by this archetype.
-  static CanType getAny(CanType existential, Type interfaceType);
+  static Type getAny(Type existential, Type interfaceType);
 
   /// Create a new archetype that represents the opened type
   /// of an existential value.
@@ -6845,7 +6842,7 @@ class OpenedArchetypeType final : public LocalArchetypeType,
   /// will unwrap any existential metatype containers.
   ///
   /// \param existential The existential type or existential metatype to open.
-  static CanType getAny(CanType existential);
+  static Type getAny(Type existential);
 
   /// Retrieve the ID number of this opened existential.
   UUID getOpenedExistentialID() const;

lib/AST/ASTContext.cpp

@@ -5334,19 +5334,25 @@ CanOpenedArchetypeType OpenedArchetypeType::get(CanType existential,
   return CanOpenedArchetypeType(result);
 }
 
-CanType OpenedArchetypeType::getAny(CanType existential, Type interfaceType) {
+Type OpenedArchetypeType::getAny(Type existential, Type interfaceTy) {
   assert(existential->isAnyExistentialType());
   if (auto metatypeTy = existential->getAs<ExistentialMetatypeType>()) {
     auto instanceTy =
         metatypeTy->getExistentialInstanceType()->getCanonicalType();
-    return CanMetatypeType::get(
-        OpenedArchetypeType::getAny(instanceTy, interfaceType));
+    auto openedInstanceTy = OpenedArchetypeType::getAny(
+        instanceTy, interfaceTy);
+    if (metatypeTy->hasRepresentation()) {
+      return MetatypeType::get(openedInstanceTy,
+                               metatypeTy->getRepresentation());
+    }
+    return MetatypeType::get(openedInstanceTy);
   }
   assert(existential->isExistentialType());
-  return OpenedArchetypeType::get(existential, interfaceType);
+  return OpenedArchetypeType::get(existential->getCanonicalType(),
+                                  interfaceTy);
 }
 
-CanType OpenedArchetypeType::getAny(CanType existential) {
+Type OpenedArchetypeType::getAny(Type existential) {
   auto interfaceTy = OpenedArchetypeType::getSelfInterfaceTypeFromContext(
       GenericSignature(), existential->getASTContext());
   return getAny(existential, interfaceTy);

lib/AST/Type.cpp

@@ -4395,20 +4395,6 @@ SILBoxType::SILBoxType(ASTContext &C,
   assert(Substitutions.isCanonical());
 }
 
-Type TypeBase::openAnyExistentialType(OpenedArchetypeType *&opened) {
-  assert(isAnyExistentialType());
-  if (auto metaty = getAs<ExistentialMetatypeType>()) {
-    opened = OpenedArchetypeType::get(
-        metaty->getExistentialInstanceType()->getCanonicalType());
-    if (metaty->hasRepresentation())
-      return MetatypeType::get(opened, metaty->getRepresentation());
-    else
-      return MetatypeType::get(opened);
-  }
-  opened = OpenedArchetypeType::get(getCanonicalType());
-  return opened;
-}
-
 AnyFunctionType *AnyFunctionType::getWithoutDifferentiability() const {
   SmallVector<Param, 8> newParams;
   for (auto &param : getParams()) {

lib/IRGen/GenHeap.cpp

@@ -2054,7 +2054,7 @@ IsaEncoding irgen::getIsaEncodingForType(IRGenModule &IGM,
   // Existentials use the encoding of the enclosed dynamic type.
   if (type->isAnyExistentialType()) {
     return getIsaEncodingForType(
-        IGM, OpenedArchetypeType::getAny(type));
+        IGM, OpenedArchetypeType::getAny(type)->getCanonicalType());
   }
 
   if (auto archetype = dyn_cast<ArchetypeType>(type)) {

lib/SILGen/SILGenConcurrency.cpp

@@ -298,7 +298,8 @@ emitDistributedActorIsolation(SILGenFunction &SGF, SILLocation loc,
                               ManagedValue actor, CanType actorType) {
   // First, open the actor type if it's an existential type.
   if (actorType->isExistentialType()) {
-    CanType openedType = OpenedArchetypeType::getAny(actorType);
+    CanType openedType = OpenedArchetypeType::getAny(actorType)
+        ->getCanonicalType();
     SILType loweredOpenedType = SGF.getLoweredType(openedType);
 
     actor = SGF.emitOpenExistential(loc, actor, loweredOpenedType,

lib/SILGen/SILGenPoly.cpp

@@ -254,7 +254,8 @@ SILGenFunction::emitTransformExistential(SILLocation loc,
   FormalEvaluationScope scope(*this);
 
   if (inputType->isAnyExistentialType()) {
-    CanType openedType = OpenedArchetypeType::getAny(inputType);
+    CanType openedType = OpenedArchetypeType::getAny(inputType)
+        ->getCanonicalType();
     SILType loweredOpenedType = getLoweredType(openedType);
 
     input = emitOpenExistential(loc, input,
@@ -641,8 +642,8 @@ ManagedValue Transform::transform(ManagedValue v,
 
     auto layout = instanceType.getExistentialLayout();
     if (layout.getSuperclass()) {
-      CanType openedType =
-          OpenedArchetypeType::getAny(inputSubstType);
+      CanType openedType = OpenedArchetypeType::getAny(inputSubstType)
+          ->getCanonicalType();
       SILType loweredOpenedType = SGF.getLoweredType(openedType);
 
       FormalEvaluationScope scope(SGF);

lib/SILOptimizer/FunctionSignatureTransforms/ExistentialTransform.cpp

@@ -426,12 +426,9 @@ void ExistentialTransform::populateThunkBody() {
     if (iter != ArgToGenericTypeMap.end() &&
         it != ExistentialArgDescriptor.end()) {
       ExistentialTransformArgumentDescriptor &ETAD = it->second;
-      OpenedArchetypeType *Opened;
       auto OrigOperand = ThunkBody->getArgument(ArgDesc.Index);
       auto SwiftType = ArgDesc.Arg->getType().getASTType();
-      auto OpenedType =
-          SwiftType
-              ->openAnyExistentialType(Opened)
+      auto OpenedType = OpenedArchetypeType::getAny(SwiftType)
               ->getCanonicalType();
       auto OpenedSILType = NewF->getLoweredType(OpenedType);
       SILValue archetypeValue;

lib/SILOptimizer/Utils/DistributedActor.cpp

@@ -39,9 +39,8 @@ void emitDistributedActorSystemWitnessCall(
 
   // If the base is an existential open it.
   if (systemASTType->isAnyExistentialType()) {
-    OpenedArchetypeType *opened;
-    systemASTType = systemASTType->openAnyExistentialType(opened)
-                        ->getCanonicalType();
+    systemASTType = OpenedArchetypeType::getAny(systemASTType)
+        ->getCanonicalType();
     base = B.createOpenExistentialAddr(
         loc, base, F.getLoweredType(systemASTType),
         OpenedExistentialAccess::Immutable);

lib/Sema/ConstraintSystem.cpp

@@ -772,8 +772,12 @@ ConstraintLocator *ConstraintSystem::getOpenOpaqueLocator(
 
 std::pair<Type, OpenedArchetypeType *> ConstraintSystem::openExistentialType(
     Type type, ConstraintLocator *locator) {
-  OpenedArchetypeType *opened = nullptr;
-  Type result = type->openAnyExistentialType(opened);
+  Type result = OpenedArchetypeType::getAny(type);
+  Type t = result;
+  while (t->is<MetatypeType>())
+    t = t->getMetatypeInstanceType();
+  auto *opened = t->castTo<OpenedArchetypeType>();
+
   assert(OpenedExistentialTypes.count(locator) == 0);
   OpenedExistentialTypes.insert({locator, opened});
   return {result, opened};