Merge pull request #41201 from AnthonyLatsis/opened-root

AnthonyLatsis · web-flow · commit 352b3a2f6d25 · 2022-02-16T09:07:30.000+03:00
AST: Remove OpenedArchetypeType::getOpenedExistentialType()
diff --git a/include/swift/AST/Types.h b/include/swift/AST/Types.h
@@ -5773,9 +5773,6 @@ class OpenedArchetypeType final : public ArchetypeType,
 
   /// Retrieve the ID number of this opened existential.
   UUID getOpenedExistentialID() const;
-  
-  /// Retrieve the opened existential type
-  Type getOpenedExistentialType() const;
 
   /// Return the archetype that represents the root generic parameter of its
   /// interface type.
@@ -6415,8 +6412,7 @@ inline bool TypeBase::isOpenedExistentialWithError() {
 
   CanType T = getCanonicalType();
   if (auto archetype = dyn_cast<OpenedArchetypeType>(T)) {
-    auto openedExistentialType = archetype->getOpenedExistentialType();
-    return openedExistentialType->isExistentialWithError();
+    return archetype->getExistentialType()->isExistentialWithError();
   }
   return false;
 }
diff --git a/include/swift/SIL/SILCloner.h b/include/swift/SIL/SILCloner.h
@@ -248,8 +248,10 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
     return asImpl().remapASTType(ty);
   }
 
-  void remapOpenedType(CanOpenedArchetypeType archetypeTy) {
-    auto existentialTy = archetypeTy->getOpenedExistentialType()->getCanonicalType();
+  void remapRootOpenedType(CanOpenedArchetypeType archetypeTy) {
+    assert(archetypeTy->isRoot());
+
+    auto existentialTy = archetypeTy->getExistentialType()->getCanonicalType();
     auto replacementTy = OpenedArchetypeType::get(
         getOpASTType(existentialTy),
         archetypeTy->getInterfaceType());
@@ -2199,7 +2201,7 @@ template<typename ImplClass>
 void
 SILCloner<ImplClass>::visitOpenExistentialAddrInst(OpenExistentialAddrInst *Inst) {
   // Create a new archetype for this opened existential type.
-  remapOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
+  remapRootOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
@@ -2212,7 +2214,7 @@ template <typename ImplClass>
 void SILCloner<ImplClass>::visitOpenExistentialValueInst(
     OpenExistentialValueInst *Inst) {
   // Create a new archetype for this opened existential type.
-  remapOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
+  remapRootOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
@@ -2235,7 +2237,7 @@ visitOpenExistentialMetatypeInst(OpenExistentialMetatypeInst *Inst) {
     exType = exMetatype->getExistentialInstanceType()->getCanonicalType();
     openedType = cast<MetatypeType>(openedType).getInstanceType();
   }
-  remapOpenedType(cast<OpenedArchetypeType>(openedType));
+  remapRootOpenedType(cast<OpenedArchetypeType>(openedType));
 
   if (!Inst->getOperand()->getType().canUseExistentialRepresentation(
           ExistentialRepresentation::Class)) {
@@ -2259,7 +2261,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialRefInst(OpenExistentialRefInst *Inst) {
   // Create a new archetype for this opened existential type.
-  remapOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
+  remapRootOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
@@ -2276,7 +2278,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialBoxInst(OpenExistentialBoxInst *Inst) {
   // Create a new archetype for this opened existential type.
-  remapOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
+  remapRootOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(Inst, getBuilder().createOpenExistentialBox(
@@ -2290,7 +2292,7 @@ void
 SILCloner<ImplClass>::
 visitOpenExistentialBoxValueInst(OpenExistentialBoxValueInst *Inst) {
   // Create a new archetype for this opened existential type.
-  remapOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
+  remapRootOpenedType(Inst->getType().castTo<OpenedArchetypeType>());
 
   getBuilder().setCurrentDebugScope(getOpScope(Inst->getDebugScope()));
   recordClonedInstruction(
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -4481,10 +4481,10 @@ CanOpenedArchetypeType OpenedArchetypeType::get(CanType existential,
     auto found = openedExistentialEnvironments.find(*knownID);
     
     if (found != openedExistentialEnvironments.end()) {
+      assert(found->second->getOpenedExistentialType()->isEqual(existential) &&
+             "Retrieved the wrong generic environment?");
       auto result = found->second->mapTypeIntoContext(interfaceType)
           ->castTo<OpenedArchetypeType>();
-      assert(result->getOpenedExistentialType()->isEqual(existential) &&
-             "Retrieved the wrong opened existential type?");
       return CanOpenedArchetypeType(result);
     }
   } else {
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -3743,7 +3743,8 @@ namespace {
     }
     void visitOpenedArchetypeType(OpenedArchetypeType *T, StringRef label) {
       printArchetypeCommon(T, "opened_archetype_type", label);
-      printRec("opened_existential", T->getOpenedExistentialType());
+      printRec("opened_existential",
+               T->getGenericEnvironment()->getOpenedExistentialType());
       printField("opened_existential_id", T->getOpenedExistentialID());
       PrintWithColorRAII(OS, ParenthesisColor) << ')';
     }
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -943,13 +943,10 @@ class PrintAST : public ASTVisitor<PrintAST> {
         // so we can't use it for TypeTransformContext.
         // To work around this, replace the OpenedArchetypeType with the type of
         // the protocol itself.
-        CurrentType = CurrentType.transform([](Type T) -> Type {
-          if (auto *Opened = T->getAs<OpenedArchetypeType>()) {
-            return Opened->getOpenedExistentialType();
-          } else {
-            return T;
-          }
-        });
+        if (auto *Opened = CurrentType->getAs<OpenedArchetypeType>()) {
+          assert(Opened->isRoot());
+          CurrentType = Opened->getExistentialType();
+        }
         CurrentType = CurrentType->mapTypeOutOfContext();
       }
       setCurrentType(CurrentType);
@@ -5983,7 +5980,7 @@ class TypePrinter : public TypeVisitor<TypePrinter> {
 
     if (Options.PrintForSIL)
       Printer << "@opened(\"" << T->getOpenedExistentialID() << "\") ";
-    visit(T->getOpenedExistentialType());
+    visit(T->getExistentialType());
   }
 
   void printArchetypeCommon(ArchetypeType *T,
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
@@ -483,7 +483,7 @@ Type TypeBase::typeEraseOpenedArchetypesWithRoot(
     return type;
 
   const auto sig = root->getASTContext().getOpenedArchetypeSignature(
-      root->getOpenedExistentialType());
+      root->getExistentialType());
 
   unsigned metatypeDepth = 0;
 
@@ -519,7 +519,7 @@ Type TypeBase::typeEraseOpenedArchetypesWithRoot(
 
       Type erasedTy;
       if (root->isEqual(archetype)) {
-        erasedTy = root->getOpenedExistentialType();
+        erasedTy = root->getExistentialType();
       } else {
         erasedTy =
             sig->getNonDependentUpperBounds(archetype->getInterfaceType());
@@ -3345,9 +3345,12 @@ bool ArchetypeType::isRoot() const {
 
 Type ArchetypeType::getExistentialType() const {
   // Opened types hold this directly.
-  if (auto opened = dyn_cast<OpenedArchetypeType>(this))
-    return opened->getOpenedExistentialType();
-  
+  if (auto *opened = dyn_cast<OpenedArchetypeType>(this)) {
+    if (opened->isRoot()) {
+      return getGenericEnvironment()->getOpenedExistentialType();
+    }
+  }
+
   // Otherwise, compute it from scratch.
   SmallVector<Type, 4> constraintTypes;
   
@@ -3398,10 +3401,6 @@ UUID OpenedArchetypeType::getOpenedExistentialID() const {
   return getGenericEnvironment()->getOpenedExistentialUUID();
 }
 
-Type OpenedArchetypeType::getOpenedExistentialType() const {
-  return getGenericEnvironment()->getOpenedExistentialType();
-}
-
 OpaqueTypeArchetypeType::OpaqueTypeArchetypeType(
     GenericEnvironment *environment,
     RecursiveTypeProperties properties,
diff --git a/lib/IDE/Utils.cpp b/lib/IDE/Utils.cpp
@@ -1299,8 +1299,10 @@ void swift::ide::getReceiverType(Expr *Base,
     ReceiverTy = SelfT->getSelfType();
 
   // TODO: Handle generics and composed protocols
-  if (auto OpenedTy = ReceiverTy->getAs<OpenedArchetypeType>())
-    ReceiverTy = OpenedTy->getOpenedExistentialType();
+  if (auto OpenedTy = ReceiverTy->getAs<OpenedArchetypeType>()) {
+    assert(OpenedTy->isRoot());
+    ReceiverTy = OpenedTy->getExistentialType();
+  }
 
   if (auto TyD = ReceiverTy->getAnyNominal()) {
     Types.push_back(TyD);
diff --git a/lib/SILGen/ResultPlan.cpp b/lib/SILGen/ResultPlan.cpp
@@ -100,7 +100,7 @@ mapTypeOutOfOpenedExistentialContext(CanType t) {
     params.push_back(param);
 
     const auto constraintTy = openedTypes[i]
-                                  ->getOpenedExistentialType()
+                                  ->getExistentialType()
                                   ->castTo<ExistentialType>()
                                   ->getConstraintType();
     requirements.emplace_back(RequirementKind::Conformance, param,
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -3049,7 +3049,8 @@ buildThunkSignature(SILGenFunction &SGF,
   auto *newGenericParam =
       GenericTypeParamType::get(/*type sequence*/ false, depth, 0, ctx);
 
-  auto constraint = openedExistential->getOpenedExistentialType();
+  assert(openedExistential->isRoot());
+  auto constraint = openedExistential->getExistentialType();
   if (auto existential = constraint->getAs<ExistentialType>())
     constraint = existential->getConstraintType();
 
diff --git a/lib/SILOptimizer/Differentiation/Thunk.cpp b/lib/SILOptimizer/Differentiation/Thunk.cpp
@@ -67,7 +67,8 @@ CanGenericSignature buildThunkSignature(SILFunction *fn, bool inheritGenericSig,
   auto *newGenericParam =
       GenericTypeParamType::get(/*type sequence*/ false, depth, 0, ctx);
 
-  auto constraint = openedExistential->getOpenedExistentialType();
+  assert(openedExistential->isRoot());
+  auto constraint = openedExistential->getExistentialType();
   if (auto existential = constraint->getAs<ExistentialType>())
     constraint = existential->getConstraintType();
 
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -66,10 +66,10 @@ Type Solution::getFixedType(TypeVariableType *typeVar) const {
 /// members via dynamic lookup.
 static bool isOpenedAnyObject(Type type) {
   auto archetype = type->getAs<OpenedArchetypeType>();
-  if (!archetype)
+  if (!archetype || !archetype->isRoot())
     return false;
 
-  return archetype->getOpenedExistentialType()->isAnyObject();
+  return archetype->getExistentialType()->isAnyObject();
 }
 
 SubstitutionMap
@@ -7514,7 +7514,7 @@ Expr *ExprRewriter::finishApply(ApplyExpr *apply, Type openedType,
             ->getExistentialInstanceType();
         }
         assert(openedInstanceTy->castTo<OpenedArchetypeType>()
-                   ->getOpenedExistentialType()
+                   ->getExistentialType()
                    ->isEqual(existentialInstanceTy));
 
         auto opaqueValue =

Original file line number	Diff line number	Diff line change
`@@ -3743,7 +3743,8 @@ namespace {`
`3743`	`3743`	`}`
`3744`	`3744`	`void visitOpenedArchetypeType(OpenedArchetypeType *T, StringRef label) {`
`3745`	`3745`	`printArchetypeCommon(T, "opened_archetype_type", label);`
`3746`		`- printRec("opened_existential", T->getOpenedExistentialType());`
	`3746`	`+ printRec("opened_existential",`
	`3747`	`+ T->getGenericEnvironment()->getOpenedExistentialType());`
`3747`	`3748`	`printField("opened_existential_id", T->getOpenedExistentialID());`
`3748`	`3749`	`PrintWithColorRAII(OS, ParenthesisColor) << ')';`
`3749`	`3750`	`}`