Merge pull request #40049 from ktoso/wip-transport-no-default

swift-ci · web-flow · commit 276110bbf481 · 2021-11-04T03:16:42.000-07:00
diff --git a/lib/SILGen/SILGenDistributed.cpp b/lib/SILGen/SILGenDistributed.cpp
@@ -51,12 +51,6 @@ static SILValue emitActorPropertyReference(
     VarDecl *property) {
   Type formalType = SGF.F.mapTypeIntoContext(property->getInterfaceType());
   SILType loweredType = SGF.getLoweredType(formalType).getAddressType();
-#if false
-  if (!loweredType.isAddress()) {
-    loweredType = SILType::getPrimitiveAddressType(
-        formalType->getCanonicalType());
-  }
-#endif
   return SGF.B.createRefElementAddr(loc, actorSelf, property, loweredType);
 }
 
diff --git a/stdlib/public/Distributed/ActorTransport.swift b/stdlib/public/Distributed/ActorTransport.swift
@@ -108,6 +108,6 @@ public struct AnyActorTransport: ActorTransport {
   }
 }
 
-/// Use the existential wrapper as the default actor transport.
-@available(SwiftStdlib 5.6, *)
-public typealias DefaultActorTransport = AnyActorTransport
+///// Use the existential wrapper as the default actor transport.
+//@available(SwiftStdlib 5.6, *)
+//public typealias DefaultActorTransport = AnyActorTransport
diff --git a/stdlib/public/Distributed/DistributedActor.swift b/stdlib/public/Distributed/DistributedActor.swift
@@ -35,7 +35,7 @@ public protocol AnyActor: Sendable, AnyObject {}
 /// distributed actor.
 @available(SwiftStdlib 5.6, *)
 public protocol DistributedActor:
-    AnyActor, Sendable, Identifiable, Hashable, Codable {
+    AnyActor, Identifiable, Hashable, Codable {
     /// The type of transport used to communicate with actors of this type.
     associatedtype Transport: ActorTransport
 
diff --git a/test/Distributed/Inputs/dynamic_replacement_da_decl.swift b/test/Distributed/Inputs/dynamic_replacement_da_decl.swift
@@ -15,6 +15,8 @@
 import _Distributed
 
 distributed actor DA {
+  typealias Transport = AnyActorTransport
+
   distributed func hello(other: DA) {}
 }
 
diff --git a/test/Distributed/SIL/distributed_actor_default_deinit_sil.swift b/test/Distributed/SIL/distributed_actor_default_deinit_sil.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 class SomeClass {}
 
 distributed actor MyDistActor {
diff --git a/test/Distributed/SIL/distributed_actor_default_init_sil.swift b/test/Distributed/SIL/distributed_actor_default_init_sil.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 class SomeClass {}
 
 distributed actor MyDistActor {
diff --git a/test/Distributed/actor_protocols.swift b/test/Distributed/actor_protocols.swift
@@ -32,7 +32,9 @@ struct E: Actor {
 
 // ==== -----------------------------------------------------------------------
 
-distributed actor DA: DistributedActor {} // ok
+distributed actor DA: DistributedActor {
+  typealias Transport = AnyActorTransport
+}
 
 actor A2: DistributedActor {
   // expected-error@-1{{non-distributed actor type 'A2' cannot conform to the 'DistributedActor' protocol}} {{1-1=distributed }}
diff --git a/test/Distributed/distributed_actor_basic.swift b/test/Distributed/distributed_actor_basic.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 distributed actor DA {
 }
 
diff --git a/test/Distributed/distributed_actor_cannot_be_downcast_to_actor.swift b/test/Distributed/distributed_actor_cannot_be_downcast_to_actor.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 @available(SwiftStdlib 5.6, *)
 extension Actor {
     func f() -> String { "Life is Study!" }
diff --git a/test/Distributed/distributed_actor_func_implicitly_async_throws.swift b/test/Distributed/distributed_actor_func_implicitly_async_throws.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 @available(SwiftStdlib 5.6, *)
 distributed actor D {
 
diff --git a/test/Distributed/distributed_actor_inference.swift b/test/Distributed/distributed_actor_inference.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 actor SomeActor { }
 
 // ==== ------------------------------------------------------------------------
diff --git a/test/Distributed/distributed_actor_initialization.swift b/test/Distributed/distributed_actor_initialization.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 distributed actor OK0 { }
 
 distributed actor OK1 {
diff --git a/test/Distributed/distributed_actor_isolation.swift b/test/Distributed/distributed_actor_isolation.swift
@@ -7,6 +7,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 struct ActorAddress: ActorIdentity {
   let address: String
   init(parse address : String) {
diff --git a/test/Distributed/distributed_actor_isolation_and_tasks.swift b/test/Distributed/distributed_actor_isolation_and_tasks.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 struct SomeLogger {}
 struct Logger {
   let label: String
diff --git a/test/Distributed/distributed_actor_nonisolated.swift b/test/Distributed/distributed_actor_nonisolated.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 @available(SwiftStdlib 5.6, *)
 distributed actor DA {
 
diff --git a/test/Distributed/distributed_actor_protocol_isolation.swift b/test/Distributed/distributed_actor_protocol_isolation.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 // ==== ------------------------------------------------------------------------
 // MARK: Protocols
 
diff --git a/test/Distributed/distributed_actor_resolve.swift b/test/Distributed/distributed_actor_resolve.swift
@@ -4,20 +4,14 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
 @available(SwiftStdlib 5.6, *)
-distributed actor Capybara { }
+typealias DefaultActorTransport = AnyActorTransport
 
-//@available(SwiftStdlib 5.6, *)
-//protocol Wheeker: DistributedActor { }
-//@available(SwiftStdlib 5.6, *)
-//distributed actor GuineaPing: Wheeker { }
+@available(SwiftStdlib 5.6, *)
+distributed actor Capybara { }
 
 @available(SwiftStdlib 5.6, *)
 func test(identity: AnyActorIdentity, transport: AnyActorTransport) async throws {
   let _: Capybara = try Capybara.resolve(identity, using: transport)
-
-// TODO: implement resolve being able to be called on a distributed actor protocol
-//       (yes, normally it is not allowed to call such function... so we need to
-//        discuss and figure out how we want to expose the resolve of a protocol)
-//  let c: Wheeker = try Wheeker.resolve(.init(identity), using: transport)
 }
diff --git a/test/Distributed/distributed_protocol_isolation.swift b/test/Distributed/distributed_protocol_isolation.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 // ==== -----------------------------------------------------------------------
 // MARK: Distributed actor protocols
 
diff --git a/test/IRGen/distributed_actor.swift b/test/IRGen/distributed_actor.swift
@@ -10,5 +10,6 @@ import _Distributed
 
 @available(SwiftStdlib 5.6, *)
 public distributed actor MyActor {
-    // nothing
+  public typealias Transport = AnyActorTransport
+  // nothing
 }
diff --git a/test/SILGen/distributed_thunk.swift b/test/SILGen/distributed_thunk.swift
@@ -4,7 +4,9 @@
 
 import _Distributed
 
-distributed actor DA { }
+distributed actor DA {
+  typealias Transport = AnyActorTransport
+}
 
 extension DA {
   // CHECK-LABEL: sil hidden [thunk] [ossa] @$s17distributed_thunk2DAC1fyyFTE : $@convention(method) @async (@guaranteed DA) -> @error Error
diff --git a/test/Serialization/Inputs/def_distributed.swift b/test/Serialization/Inputs/def_distributed.swift
@@ -1,5 +1,8 @@
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 @available(SwiftStdlib 5.6, *)
 public distributed actor DA {
   public distributed func doSomethingDistributed(param: String) async -> Int {
diff --git a/test/TBD/distributed.swift b/test/TBD/distributed.swift
@@ -8,6 +8,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 // CHECK: @"$s4test1AC13_remote_helloyyYaKFTE" = hidden global %swift.async_func_pointer
 // CHECK: @"$s4test1AC13_remote_helloyyYaKFTETu" = hidden global %swift.async_func_pointer
 distributed actor SomeDistributedActor {
diff --git a/test/decl/protocol/special/DistributedActor.swift b/test/decl/protocol/special/DistributedActor.swift
@@ -4,6 +4,9 @@
 
 import _Distributed
 
+/// Use the existential wrapper as the default actor transport.
+typealias DefaultActorTransport = AnyActorTransport
+
 distributed actor D1 {
   var x: Int = 17
 }

Original file line number	Diff line number	Diff line change
`@@ -108,6 +108,6 @@ public struct AnyActorTransport: ActorTransport {`
`108`	`108`	`}`
`109`	`109`	`}`
`110`	`110`
`111`		`-/// Use the existential wrapper as the default actor transport.`
`112`		`-@available(SwiftStdlib 5.6, *)`
`113`		`-public typealias DefaultActorTransport = AnyActorTransport`
	`111`	`+///// Use the existential wrapper as the default actor transport.`
	`112`	`+//@available(SwiftStdlib 5.6, *)`
	`113`	`+//public typealias DefaultActorTransport = AnyActorTransport`
Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,8 @@`
`15`	`15`	`import _Distributed`
`16`	`16`
`17`	`17`	`distributed actor DA {`
	`18`	`+ typealias Transport = AnyActorTransport`
	`19`	`+`
`18`	`20`	`distributed func hello(other: DA) {}`
`19`	`21`	`}`
`20`	`22`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,9 @@`
`4`	`4`
`5`	`5`	`import _Distributed`
`6`	`6`
	`7`	`+/// Use the existential wrapper as the default actor transport.`
	`8`	`+typealias DefaultActorTransport = AnyActorTransport`
	`9`	`+`
`7`	`10`	`distributed actor DA {`
`8`	`11`	`}`
`9`	`12`