Merge pull request #72762 from slavapestov/fix-rdar125460667

slavapestov · web-flow · commit 5a546ed6b0c6 · 2024-04-02T08:30:33.000-04:00
Sema: Fix existential-metatype-to-Any conversion
diff --git a/include/swift/AST/Type.h b/include/swift/AST/Type.h
@@ -126,17 +126,6 @@ class MakeAbstractConformanceForGenericType {
                                     ProtocolDecl *conformedProtocol) const;
 };
 
-/// Functor class suitable for use as a \c LookupConformanceFn that provides
-/// only abstract conformances, or builtin conformances for invertible protocols
-/// for generic types. Asserts that the replacement
-/// type is an opaque generic type.
-class MakeAbstractOrBuiltinConformanceForGenericType {
-public:
-  ProtocolConformanceRef operator()(CanType dependentType,
-                                    Type conformingReplacementType,
-                                    ProtocolDecl *conformedProtocol) const;
-};
-
 /// Functor class suitable for use as a \c LookupConformanceFn that fetches
 /// conformances from a generic signature.
 class LookUpConformanceInSignature {
diff --git a/include/swift/SIL/SILCloner.h b/include/swift/SIL/SILCloner.h
@@ -196,7 +196,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
         // If we found a type containing a local archetype, substitute
         // open existentials throughout the substitution map.
         Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-                          MakeAbstractOrBuiltinConformanceForGenericType());
+                          MakeAbstractConformanceForGenericType());
       }
     }
 
@@ -219,7 +219,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
     return Ty.subst(
       Builder.getModule(),
       QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-      MakeAbstractOrBuiltinConformanceForGenericType(),
+      MakeAbstractConformanceForGenericType(),
       CanGenericSignature());
   }
   SILType getOpType(SILType Ty) {
@@ -239,7 +239,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
 
     return ty.subst(
       QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},
-      MakeAbstractOrBuiltinConformanceForGenericType()
+      MakeAbstractConformanceForGenericType()
     )->getCanonicalType();
   }
 
@@ -352,7 +352,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {
         conformance.subst(ty,
                           QueryTypeSubstitutionMapOrIdentity{
                                                         LocalArchetypeSubs},
-                          MakeAbstractOrBuiltinConformanceForGenericType());
+                          MakeAbstractConformanceForGenericType());
     }
 
     return asImpl().remapConformance(getASTTypeInClonedContext(ty),
diff --git a/lib/AST/TypeSubstitution.cpp b/lib/AST/TypeSubstitution.cpp
@@ -230,22 +230,6 @@ operator()(CanType dependentType, Type conformingReplacementType,
   return Subs.lookupConformance(dependentType, conformedProtocol);
 }
 
-ProtocolConformanceRef MakeAbstractOrBuiltinConformanceForGenericType::
-operator()(CanType dependentType, Type conformingReplacementType,
-           ProtocolDecl *conformedProtocol) const {
-  // Workaround for rdar://125460667
-  if (conformedProtocol->getInvertibleProtocolKind()) {
-    auto &ctx = conformedProtocol->getASTContext();
-    return ProtocolConformanceRef(
-        ctx.getBuiltinConformance(conformingReplacementType, conformedProtocol,
-                                  BuiltinConformanceKind::Synthesized));
-  }
-
-  return MakeAbstractConformanceForGenericType()(dependentType,
-                                                 conformingReplacementType,
-                                                 conformedProtocol);
-}
-
 ProtocolConformanceRef MakeAbstractConformanceForGenericType::
 operator()(CanType dependentType, Type conformingReplacementType,
            ProtocolDecl *conformedProtocol) const {
diff --git a/lib/SIL/IR/SILInstructions.cpp b/lib/SIL/IR/SILInstructions.cpp
@@ -2185,14 +2185,24 @@ ObjCMethodInst::create(SILDebugLocation DebugLoc, SILValue Operand,
                                        Member, Ty);
 }
 
+static void checkExistentialPreconditions(SILType ExistentialType,
+                                          CanType ConcreteType,
+                                ArrayRef<ProtocolConformanceRef> Conformances) {
+#ifndef NDEBUG
+  auto layout = ExistentialType.getASTType().getExistentialLayout();
+  assert(layout.getProtocols().size() == Conformances.size());
+
+  for (auto conformance : Conformances) {
+    assert(!conformance.isAbstract() || isa<ArchetypeType>(ConcreteType));
+  }
+#endif
+}
+
 InitExistentialAddrInst *InitExistentialAddrInst::create(
     SILDebugLocation Loc, SILValue Existential, CanType ConcreteType,
     SILType ConcreteLoweredType, ArrayRef<ProtocolConformanceRef> Conformances,
     SILFunction *F) {
-#ifndef NDEBUG
-  auto layout = Existential->getType().getASTType().getExistentialLayout();
-  assert(layout.getProtocols().size() == Conformances.size());
-#endif
+  checkExistentialPreconditions(Existential->getType(), ConcreteType, Conformances);
 
   SILModule &Mod = F->getModule();
   SmallVector<SILValue, 8> TypeDependentOperands;
@@ -2212,10 +2222,7 @@ InitExistentialValueInst *InitExistentialValueInst::create(
     SILDebugLocation Loc, SILType ExistentialType, CanType ConcreteType,
     SILValue Instance, ArrayRef<ProtocolConformanceRef> Conformances,
     SILFunction *F) {
-#ifndef NDEBUG
-  auto layout = ExistentialType.getASTType().getExistentialLayout();
-  assert(layout.getProtocols().size() == Conformances.size());
-#endif
+  checkExistentialPreconditions(ExistentialType, ConcreteType, Conformances);
 
   SILModule &Mod = F->getModule();
   SmallVector<SILValue, 8> TypeDependentOperands;
@@ -2233,10 +2240,7 @@ InitExistentialRefInst *InitExistentialRefInst::create(
     SILDebugLocation Loc, SILType ExistentialType, CanType ConcreteType,
     SILValue Instance, ArrayRef<ProtocolConformanceRef> Conformances,
     SILFunction *F, ValueOwnershipKind forwardingOwnershipKind) {
-#ifndef NDEBUG
-  auto layout = ExistentialType.getASTType().getExistentialLayout();
-  assert(layout.getProtocols().size() == Conformances.size());
-#endif
+  checkExistentialPreconditions(ExistentialType, ConcreteType, Conformances);
 
   SILModule &Mod = F->getModule();
   SmallVector<SILValue, 8> TypeDependentOperands;
diff --git a/lib/SILGen/SILGenConvert.cpp b/lib/SILGen/SILGenConvert.cpp
@@ -853,9 +853,6 @@ ManagedValue SILGenFunction::emitExistentialErasure(
     [&, concreteFormalType, F](SGFContext C) -> ManagedValue {
       auto concreteValue = F(SGFContext());
       assert(concreteFormalType->isBridgeableObjectType());
-      auto *M = SGM.M.getSwiftModule();
-      auto conformances = M->collectExistentialConformances(
-          concreteFormalType, anyObjectTy);
       return B.createInitExistentialRef(
           loc, SILType::getPrimitiveObjectType(anyObjectTy), concreteFormalType,
           concreteValue, conformances);
@@ -864,6 +861,12 @@ ManagedValue SILGenFunction::emitExistentialErasure(
     if (this->F.getLoweredFunctionType()->isPseudogeneric()) {
       if (anyObjectTy && concreteFormalType->is<ArchetypeType>()) {
         concreteFormalType = anyObjectTy;
+
+        // The original conformances are no good because they have the wrong
+        // (pseudogeneric) subject type.
+        auto *M = SGM.M.getSwiftModule();
+        conformances = M->collectExistentialConformances(
+            concreteFormalType, anyObjectTy);
         F = eraseToAnyObject;
       }
     }
diff --git a/lib/Sema/CSApply.cpp b/lib/Sema/CSApply.cpp
@@ -6688,13 +6688,24 @@ Expr *ExprRewriter::coerceExistential(Expr *expr, Type toType,
   Type fromInstanceType = fromType;
   Type toInstanceType = toType;
 
-  // Look through metatypes
+  // For existential-to-existential coercions, open the source existential.
+  Type openedFromType;
+  if (fromType->isAnyExistentialType()) {
+    openedFromType = OpenedArchetypeType::getAny(fromType->getCanonicalType(),
+                                                 dc->getGenericSignatureOfContext());
+  }
+
+  Type openedFromInstanceType = openedFromType;
+
+  // Look through metatypes.
   while ((fromInstanceType->is<UnresolvedType>() ||
           fromInstanceType->is<AnyMetatypeType>()) &&
          toInstanceType->is<ExistentialMetatypeType>()) {
     if (!fromInstanceType->is<UnresolvedType>())
-      fromInstanceType = fromInstanceType->castTo<AnyMetatypeType>()->getInstanceType();
-    toInstanceType = toInstanceType->castTo<ExistentialMetatypeType>()->getExistentialInstanceType();
+      fromInstanceType = fromInstanceType->getMetatypeInstanceType();
+    if (openedFromInstanceType && !openedFromInstanceType->is<UnresolvedType>())
+      openedFromInstanceType = openedFromInstanceType->getMetatypeInstanceType();
+    toInstanceType = toInstanceType->getMetatypeInstanceType();
   }
 
   ASTContext &ctx = cs.getASTContext();
@@ -6758,20 +6769,13 @@ Expr *ExprRewriter::coerceExistential(Expr *expr, Type toType,
   }
 
   // For existential-to-existential coercions, open the source existential.
-  if (fromType->isAnyExistentialType()) {
-    fromType = OpenedArchetypeType::getAny(fromType->getCanonicalType(),
-                                           dc->getGenericSignatureOfContext());
-
+  if (openedFromType) {
     auto *archetypeVal = cs.cacheType(
-        new (ctx) OpaqueValueExpr(expr->getSourceRange(), fromType));
-
-    fromInstanceType = fromType;
-    while (auto *metatypeType = fromInstanceType->getAs<MetatypeType>())
-      fromInstanceType = metatypeType->getInstanceType();
+        new (ctx) OpaqueValueExpr(expr->getSourceRange(), openedFromType));
 
     auto conformances =
         dc->getParentModule()
-          ->collectExistentialConformances(fromInstanceType->getCanonicalType(),
+          ->collectExistentialConformances(openedFromInstanceType->getCanonicalType(),
                                            toInstanceType->getCanonicalType(),
                                            /*allowMissing=*/true);
 
diff --git a/test/SILOptimizer/rdar125460667.swift b/test/SILOptimizer/rdar125460667.swift
@@ -0,0 +1,9 @@
+// RUN: %target-swift-frontend -emit-sil %s
+
+@_transparent func f(a: Any.Type) -> Any {
+  return a
+}
+
+func g(a: Any.Type) {
+  f(a: a)
+}

Original file line number	Diff line number	Diff line change
`@@ -196,7 +196,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {`
`196`	`196`	`// If we found a type containing a local archetype, substitute`
`197`	`197`	`// open existentials throughout the substitution map.`
`198`	`198`	`Subs = Subs.subst(QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},`
`199`		`- MakeAbstractOrBuiltinConformanceForGenericType());`
	`199`	`+ MakeAbstractConformanceForGenericType());`
`200`	`200`	`}`
`201`	`201`	`}`
`202`	`202`
`@@ -219,7 +219,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {`
`219`	`219`	`return Ty.subst(`
`220`	`220`	`Builder.getModule(),`
`221`	`221`	`QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},`
`222`		`- MakeAbstractOrBuiltinConformanceForGenericType(),`
	`222`	`+ MakeAbstractConformanceForGenericType(),`
`223`	`223`	`CanGenericSignature());`
`224`	`224`	`}`
`225`	`225`	`SILType getOpType(SILType Ty) {`
`@@ -239,7 +239,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {`
`239`	`239`
`240`	`240`	`return ty.subst(`
`241`	`241`	`QueryTypeSubstitutionMapOrIdentity{LocalArchetypeSubs},`
`242`		`- MakeAbstractOrBuiltinConformanceForGenericType()`
	`242`	`+ MakeAbstractConformanceForGenericType()`
`243`	`243`	`)->getCanonicalType();`
`244`	`244`	`}`
`245`	`245`
`@@ -352,7 +352,7 @@ class SILCloner : protected SILInstructionVisitor<ImplClass> {`
`352`	`352`	`conformance.subst(ty,`
`353`	`353`	`QueryTypeSubstitutionMapOrIdentity{`
`354`	`354`	`LocalArchetypeSubs},`
`355`		`- MakeAbstractOrBuiltinConformanceForGenericType());`
	`355`	`+ MakeAbstractConformanceForGenericType());`
`356`	`356`	`}`
`357`	`357`
`358`	`358`	`return asImpl().remapConformance(getASTTypeInClonedContext(ty),`