[Concurrency] Obsolete AnyActor in Swift 6 using a typealias.

hborla · hborla · commit e1e1c067ca4a · 2024-05-30T09:42:59.000-07:00
(cherry picked from commit c20b0e0)
diff --git a/include/swift/AST/KnownProtocols.def b/include/swift/AST/KnownProtocols.def
@@ -77,7 +77,6 @@
     BUILTIN_EXPRESSIBLE_BY_LITERAL_PROTOCOL_WITH_NAME(name, "_" #name)
 
 PROTOCOL(Actor)
-PROTOCOL(AnyActor)
 PROTOCOL(Sequence)
 PROTOCOL(Identifiable)
 PROTOCOL(IteratorProtocol)
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -1307,7 +1307,6 @@ ProtocolDecl *ASTContext::getProtocol(KnownProtocolKind kind) const {
     M = getLoadedModule(Id_Differentiation);
     break;
   case KnownProtocolKind::Actor:
-  case KnownProtocolKind::AnyActor:
   case KnownProtocolKind::GlobalActor:
   case KnownProtocolKind::AsyncSequence:
   case KnownProtocolKind::AsyncIteratorProtocol:
diff --git a/lib/IRGen/GenMeta.cpp b/lib/IRGen/GenMeta.cpp
@@ -6718,7 +6718,6 @@ SpecialProtocol irgen::getSpecialProtocolID(ProtocolDecl *P) {
   case KnownProtocolKind::Differentiable:
   case KnownProtocolKind::FloatingPoint:
   case KnownProtocolKind::Identifiable:
-  case KnownProtocolKind::AnyActor:
   case KnownProtocolKind::Actor:
   case KnownProtocolKind::DistributedActor:
   case KnownProtocolKind::DistributedActorSystem:
diff --git a/lib/SIL/Verifier/SILVerifier.cpp b/lib/SIL/Verifier/SILVerifier.cpp
@@ -6994,10 +6994,10 @@ class SILVerifier : public SILVerifierBase<SILVerifier> {
         auto genericSig = FTy->getInvocationGenericSignature();
         auto &ctx = F.getASTContext();
         auto *actorProtocol = ctx.getProtocol(KnownProtocolKind::Actor);
-        auto *anyActorProtocol = ctx.getProtocol(KnownProtocolKind::AnyActor);
+        auto *distributedProtocol = ctx.getProtocol(KnownProtocolKind::DistributedActor);
         require(argType->isAnyActorType() ||
-                    genericSig->requiresProtocol(argType, actorProtocol) ||
-                    genericSig->requiresProtocol(argType, anyActorProtocol),
+                genericSig->requiresProtocol(argType, actorProtocol) ||
+                genericSig->requiresProtocol(argType, distributedProtocol),
                 "Only any actor types can be isolated");
         require(!foundIsolatedParameter, "Two isolated parameters");
         foundIsolatedParameter = true;
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -317,7 +317,7 @@ static void checkInheritanceClause(
         continue;
 
       // AnyObject is not allowed except on protocols.
-      if (layout.hasExplicitAnyObject) {
+      if (layout.hasExplicitAnyObject && !isa<ClassDecl>(decl)) {
         decl->diagnose(diag::inheritance_from_anyobject);
         continue;
       }
diff --git a/lib/Sema/TypeCheckProtocol.cpp b/lib/Sema/TypeCheckProtocol.cpp
@@ -6108,19 +6108,6 @@ void TypeChecker::checkConformancesInContext(IterableDeclContext *idc) {
         }
         break;
       }
-      case KnownProtocolKind::AnyActor: {
-        if (auto classDecl = dyn_cast<ClassDecl>(nominal)) {
-          if (!classDecl->isExplicitActor() &&
-              !classDecl->isExplicitDistributedActor()) {
-            dc->getSelfNominalTypeDecl()
-                ->diagnose(diag::actor_protocol_illegal_inheritance,
-                           dc->getSelfNominalTypeDecl()->getName(),
-                           proto->getName())
-                .fixItReplace(nominal->getStartLoc(), "actor");
-          }
-        }
-        break;
-      }
       case KnownProtocolKind::UnsafeSendable: {
         hasDeprecatedUnsafeSendable = true;
         break;
diff --git a/stdlib/public/Concurrency/Actor.swift b/stdlib/public/Concurrency/Actor.swift
@@ -26,17 +26,17 @@ import Swift
 /// While both local and distributed actors are conceptually "actors", there are
 /// some important isolation model differences between the two, which make it
 /// impossible for one to refine the other.
-@_marker
 @available(SwiftStdlib 5.1, *)
 @available(*, deprecated, message: "Use 'any Actor' with 'DistributedActor.asLocalActor' instead")
-public protocol AnyActor: AnyObject, Sendable {}
+@available(swift, obsoleted: 6.0, message: "Use 'any Actor' with 'DistributedActor.asLocalActor' instead")
+public typealias AnyActor = AnyObject & Sendable
 
 /// Common protocol to which all actors conform.
 ///
 /// The `Actor` protocol generalizes over all `actor` types. Actor types
 /// implicitly conform to this protocol.
 @available(SwiftStdlib 5.1, *)
-public protocol Actor: AnyActor {
+public protocol Actor: AnyObject, Sendable {
 
   /// Retrieve the executor for this actor as an optimized, unowned
   /// reference.
diff --git a/stdlib/public/Distributed/DistributedActor.swift b/stdlib/public/Distributed/DistributedActor.swift
@@ -197,7 +197,7 @@ import _Concurrency
 /// - SeeAlso: ``Actor``
 /// - SeeAlso: ``AnyActor``
 @available(SwiftStdlib 5.7, *)
-public protocol DistributedActor: AnyActor, Identifiable, Hashable
+public protocol DistributedActor: AnyObject, Sendable, Identifiable, Hashable
   where ID == ActorSystem.ActorID,
         SerializationRequirement == ActorSystem.SerializationRequirement {
   
diff --git a/test/Concurrency/actor_isolation.swift b/test/Concurrency/actor_isolation.swift
@@ -1079,8 +1079,7 @@ actor A: Actor { // ok
 @available(SwiftStdlib 5.1, *)
 class C: Actor, UnsafeSendable {
   // expected-error@-1{{non-actor type 'C' cannot conform to the 'Actor' protocol}}
-  // expected-error@-2{{non-actor type 'C' cannot conform to the 'AnyActor' protocol}}
-  // expected-warning@-3{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}
+  // expected-warning@-2{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}
   nonisolated var unownedExecutor: UnownedSerialExecutor {
     fatalError()
   }
diff --git a/test/Distributed/actor_protocols.swift b/test/Distributed/actor_protocols.swift
@@ -14,25 +14,22 @@ typealias DefaultDistributedActorSystem = FakeActorSystem
 actor A: Actor {} // ok
 
 class C: Actor, UnsafeSendable {
-  // expected-error@-1{{non-actor type 'C' cannot conform to the 'AnyActor' protocol}} {{1-6=actor}}
-  // expected-error@-2{{non-actor type 'C' cannot conform to the 'Actor' protocol}} {{1-6=actor}}
-  // expected-warning@-3{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}
+  // expected-error@-1{{non-actor type 'C' cannot conform to the 'Actor' protocol}} {{1-6=actor}}
+  // expected-warning@-2{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}
   nonisolated var unownedExecutor: UnownedSerialExecutor {
     fatalError()
   }
 }
 
 struct S: Actor {
-  // expected-error@-1{{non-class type 'S' cannot conform to class protocol 'AnyActor'}}
-  // expected-error@-2{{non-class type 'S' cannot conform to class protocol 'Actor'}}
+  // expected-error@-1{{non-class type 'S' cannot conform to class protocol 'Actor'}}
   nonisolated var unownedExecutor: UnownedSerialExecutor {
     fatalError()
   }
 }
 
 struct E: Actor {
-  // expected-error@-1{{non-class type 'E' cannot conform to class protocol 'AnyActor'}}
-  // expected-error@-2{{non-class type 'E' cannot conform to class protocol 'Actor'}}
+  // expected-error@-1{{non-class type 'E' cannot conform to class protocol 'Actor'}}
   nonisolated var unownedExecutor: UnownedSerialExecutor {
     fatalError()
   }
@@ -65,8 +62,7 @@ actor A2: DistributedActor {
 }
 
 final class DA2: DistributedActor {
-// expected-error@-1{{non-actor type 'DA2' cannot conform to the 'AnyActor' protocol}}
-// expected-error@-2{{non-distributed actor type 'DA2' cannot conform to the 'DistributedActor' protocol}}
+// expected-error@-1{{non-distributed actor type 'DA2' cannot conform to the 'DistributedActor' protocol}}
   nonisolated var id: ID {
     fatalError()
   }
@@ -87,23 +83,22 @@ final class DA2: DistributedActor {
 
 struct S2: DistributedActor {
   // expected-error@-1{{non-class type 'S2' cannot conform to class protocol 'DistributedActor'}}
-  // expected-error@-2{{non-class type 'S2' cannot conform to class protocol 'AnyActor'}}
-  // expected-error@-3{{type 'S2' does not conform to protocol 'Identifiable'}}
+  // expected-error@-2{{type 'S2' does not conform to protocol 'Identifiable'}}
 }
 
 // ==== -----------------------------------------------------------------------
 
 actor A3: AnyActor {} // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
 distributed actor DA3: AnyActor {} // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
 
-class C3: AnyActor, @unchecked Sendable { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
-  // expected-error@-1{{non-actor type 'C3' cannot conform to the 'AnyActor' protocol}} {{1-6=actor}}
+class C3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
+  // expected-warning@-1 {{non-final class 'C3' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
 }
 
 struct S3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
-  // expected-error@-1{{non-class type 'S3' cannot conform to class protocol 'AnyActor'}}
+  // expected-error@-1{{only protocols can inherit from 'AnyObject'}}
 }
 
 enum E3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}
-  // expected-error@-1{{non-class type 'E3' cannot conform to class protocol 'AnyActor'}}
+  // expected-error@-1{{only protocols can inherit from 'AnyObject'}}
 }
diff --git a/test/api-digester/stability-concurrency-abi.test b/test/api-digester/stability-concurrency-abi.test
@@ -58,10 +58,8 @@ Func _asyncLet_get(_:_:) has mangled name changing from '_Concurrency._asyncLet_
 Func _asyncLet_get(_:_:) has return type change from Builtin.RawPointer to ()
 Func _asyncLet_get_throwing(_:_:) has mangled name changing from '_Concurrency._asyncLet_get_throwing(Builtin.RawPointer, Builtin.RawPointer) async throws -> Builtin.RawPointer' to '_Concurrency._asyncLet_get_throwing(Builtin.RawPointer, Builtin.RawPointer) async throws -> ()'
 Func _asyncLet_get_throwing(_:_:) has return type change from Builtin.RawPointer to ()
-Protocol Actor has added inherited protocol AnyActor
 Protocol Actor has added inherited protocol Copyable
 Protocol Actor has added inherited protocol Escapable
-Protocol Actor has generic signature change from <Self : AnyObject, Self : Swift.Sendable> to <Self : _Concurrency.AnyActor>
 Protocol AsyncIteratorProtocol has generic signature change from to <Self.Failure : Swift.Error>
 Protocol AsyncIteratorProtocol has added inherited protocol Copyable
 Protocol AsyncIteratorProtocol has added inherited protocol Escapable
diff --git a/test/decl/class/actor/basic.swift b/test/decl/class/actor/basic.swift
@@ -7,8 +7,7 @@ actor MyActor { }
 class MyActorSubclass1: MyActor { }
 // expected-error@-1{{actor types do not support inheritance}}
 // expected-error@-2{{type 'MyActorSubclass1' cannot conform to the 'Actor' protocol}}
-// expected-error@-3{{non-actor type 'MyActorSubclass1' cannot conform to the 'AnyActor' protocol}}
-// expected-warning@-4 {{non-final class 'MyActorSubclass1' cannot conform to 'Sendable'; use '@unchecked Sendable'; this is an error in the Swift 6 language mode}}
+// expected-warning@-3 {{non-final class 'MyActorSubclass1' cannot conform to 'Sendable'; use '@unchecked Sendable'; this is an error in the Swift 6 language mode}}
 
 actor MyActorSubclass2: MyActor { } // expected-error{{actor types do not support inheritance}}
 
diff --git a/test/decl/protocol/conforms/placement.swift b/test/decl/protocol/conforms/placement.swift
@@ -105,7 +105,7 @@ extension ExplicitSub1 : P1 { } // expected-error{{redundant conformance of 'Exp
 // ---------------------------------------------------------------------------
 // Suppression of synthesized conformances
 // ---------------------------------------------------------------------------
-class SynthesizedClass1 : AnyObject { } // expected-error{{only protocols can inherit from 'AnyObject'}}
+class SynthesizedClass1 : AnyObject { }
 
 class SynthesizedClass2 { }
 extension SynthesizedClass2 : AnyObject { } // expected-error{{only protocols can inherit from 'AnyObject'}}
@@ -115,7 +115,7 @@ class SynthesizedClass3 : AnyObjectRefinement { }
 class SynthesizedClass4 { }
 extension SynthesizedClass4 : AnyObjectRefinement { }
 
-class SynthesizedSubClass1 : SynthesizedClass1, AnyObject { } // expected-error{{only protocols can inherit from 'AnyObject'}}
+class SynthesizedSubClass1 : SynthesizedClass1, AnyObject { }
 
 class SynthesizedSubClass2 : SynthesizedClass2 { }
 extension SynthesizedSubClass2 : AnyObject { } // expected-error{{only protocols can inherit from 'AnyObject'}}
diff --git a/test/decl/protocol/special/Actor.swift b/test/decl/protocol/special/Actor.swift
@@ -44,8 +44,7 @@ actor A7 {
 @available(SwiftStdlib 5.1, *)
 class C1: Actor {
   // expected-error@-1{{non-actor type 'C1' cannot conform to the 'Actor' protocol}}
-  // expected-error@-2{{non-actor type 'C1' cannot conform to the 'AnyActor' protocol}}
-  // expected-warning@-3{{non-final class 'C1' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
+  // expected-warning@-2{{non-final class 'C1' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
   nonisolated var unownedExecutor: UnownedSerialExecutor {
     fatalError("")
   }
@@ -54,8 +53,7 @@ class C1: Actor {
 @available(SwiftStdlib 5.1, *)
 class C2: Actor {
   // expected-error@-1{{non-actor type 'C2' cannot conform to the 'Actor' protocol}}
-  // expected-error@-2{{non-actor type 'C2' cannot conform to the 'AnyActor' protocol}}
-// expected-warning@-3{{non-final class 'C2' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
+// expected-warning@-2{{non-final class 'C2' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
   // FIXME: this should be an isolation violation
   var unownedExecutor: UnownedSerialExecutor {
     fatalError("")
@@ -66,8 +64,7 @@ class C2: Actor {
 class C3: Actor {
   // expected-error@-1{{type 'C3' does not conform to protocol 'Actor'}}
   // expected-error@-2{{non-actor type 'C3' cannot conform to the 'Actor' protocol}}
-  // expected-error@-3{{non-actor type 'C3' cannot conform to the 'AnyActor' protocol}}
-  // expected-warning@-4{{non-final class 'C3' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
+  // expected-warning@-3{{non-final class 'C3' cannot conform to 'Sendable'; use '@unchecked Sendable'}}
   nonisolated func enqueue(_ job: UnownedJob) { }
 }
 

Original file line number	Diff line number	Diff line change
`@@ -317,7 +317,7 @@ static void checkInheritanceClause(`
`317`	`317`	`continue;`
`318`	`318`
`319`	`319`	`// AnyObject is not allowed except on protocols.`
`320`		`- if (layout.hasExplicitAnyObject) {`
	`320`	`+ if (layout.hasExplicitAnyObject && !isa<ClassDecl>(decl)) {`
`321`	`321`	`decl->diagnose(diag::inheritance_from_anyobject);`
`322`	`322`	`continue;`
`323`	`323`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,25 +14,22 @@ typealias DefaultDistributedActorSystem = FakeActorSystem`
`14`	`14`	`actor A: Actor {} // ok`
`15`	`15`
`16`	`16`	`class C: Actor, UnsafeSendable {`
`17`		`- // expected-error@-1{{non-actor type 'C' cannot conform to the 'AnyActor' protocol}} {{1-6=actor}}`
`18`		`- // expected-error@-2{{non-actor type 'C' cannot conform to the 'Actor' protocol}} {{1-6=actor}}`
`19`		`- // expected-warning@-3{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}`
	`17`	`+ // expected-error@-1{{non-actor type 'C' cannot conform to the 'Actor' protocol}} {{1-6=actor}}`
	`18`	`+ // expected-warning@-2{{'UnsafeSendable' is deprecated: Use @unchecked Sendable instead}}`
`20`	`19`	`nonisolated var unownedExecutor: UnownedSerialExecutor {`
`21`	`20`	`fatalError()`
`22`	`21`	`}`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`struct S: Actor {`
`26`		`- // expected-error@-1{{non-class type 'S' cannot conform to class protocol 'AnyActor'}}`
`27`		`- // expected-error@-2{{non-class type 'S' cannot conform to class protocol 'Actor'}}`
	`25`	`+ // expected-error@-1{{non-class type 'S' cannot conform to class protocol 'Actor'}}`
`28`	`26`	`nonisolated var unownedExecutor: UnownedSerialExecutor {`
`29`	`27`	`fatalError()`
`30`	`28`	`}`
`31`	`29`	`}`
`32`	`30`
`33`	`31`	`struct E: Actor {`
`34`		`- // expected-error@-1{{non-class type 'E' cannot conform to class protocol 'AnyActor'}}`
`35`		`- // expected-error@-2{{non-class type 'E' cannot conform to class protocol 'Actor'}}`
	`32`	`+ // expected-error@-1{{non-class type 'E' cannot conform to class protocol 'Actor'}}`
`36`	`33`	`nonisolated var unownedExecutor: UnownedSerialExecutor {`
`37`	`34`	`fatalError()`
`38`	`35`	`}`
`@@ -65,8 +62,7 @@ actor A2: DistributedActor {`
`65`	`62`	`}`
`66`	`63`
`67`	`64`	`final class DA2: DistributedActor {`
`68`		`-// expected-error@-1{{non-actor type 'DA2' cannot conform to the 'AnyActor' protocol}}`
`69`		`-// expected-error@-2{{non-distributed actor type 'DA2' cannot conform to the 'DistributedActor' protocol}}`
	`65`	`+// expected-error@-1{{non-distributed actor type 'DA2' cannot conform to the 'DistributedActor' protocol}}`
`70`	`66`	`nonisolated var id: ID {`
`71`	`67`	`fatalError()`
`72`	`68`	`}`
`@@ -87,23 +83,22 @@ final class DA2: DistributedActor {`
`87`	`83`
`88`	`84`	`struct S2: DistributedActor {`
`89`	`85`	`// expected-error@-1{{non-class type 'S2' cannot conform to class protocol 'DistributedActor'}}`
`90`		`- // expected-error@-2{{non-class type 'S2' cannot conform to class protocol 'AnyActor'}}`
`91`		`- // expected-error@-3{{type 'S2' does not conform to protocol 'Identifiable'}}`
	`86`	`+ // expected-error@-2{{type 'S2' does not conform to protocol 'Identifiable'}}`
`92`	`87`	`}`
`93`	`88`
`94`	`89`	`// ==== -----------------------------------------------------------------------`
`95`	`90`
`96`	`91`	`actor A3: AnyActor {} // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
`97`	`92`	`distributed actor DA3: AnyActor {} // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
`98`	`93`
`99`		`-class C3: AnyActor, @unchecked Sendable { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
`100`		`- // expected-error@-1{{non-actor type 'C3' cannot conform to the 'AnyActor' protocol}} {{1-6=actor}}`
	`94`	`+class C3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
	`95`	`+ // expected-warning@-1 {{non-final class 'C3' cannot conform to 'Sendable'; use '@unchecked Sendable'}}`
`101`	`96`	`}`
`102`	`97`
`103`	`98`	`struct S3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
`104`		`- // expected-error@-1{{non-class type 'S3' cannot conform to class protocol 'AnyActor'}}`
	`99`	`+ // expected-error@-1{{only protocols can inherit from 'AnyObject'}}`
`105`	`100`	`}`
`106`	`101`
`107`	`102`	`enum E3: AnyActor { // expected-warning {{'AnyActor' is deprecated: Use 'any Actor' with 'DistributedActor.asLocalActor' instead}}`
`108`		`- // expected-error@-1{{non-class type 'E3' cannot conform to class protocol 'AnyActor'}}`
	`103`	`+ // expected-error@-1{{only protocols can inherit from 'AnyObject'}}`
`109`	`104`	`}`