Merge pull request swiftlang#38914 from ktoso/wip-enable-runtime-tests-again

[Distributed] Re-enable runtime tests

Author: ktoso

include/swift/AST/DiagnosticsSema.def

@@ -4459,10 +4459,10 @@ NOTE(actor_isolated_sync_func,none,
      "implicitly asynchronous",
      (DescriptiveDeclKind, DeclName))
 NOTE(distributed_actor_isolated_method_note,none,
-     "only 'distributed' functions can be called from outside the distributed actor", // TODO: improve error message
+     "only 'distributed' functions can be called from outside the distributed actor", // TODO(distributed): improve error message
      ())
 ERROR(distributed_actor_isolated_method,none,
-      "only 'distributed' functions can be called from outside the distributed actor", // TODO: improve error message to be more like 'non-distributed' ... defined here
+      "only 'distributed' functions can be called from outside the distributed actor", // TODO(distributed): improve error message to be more like 'non-distributed' ... defined here
       ())
 ERROR(distributed_actor_func_param_not_codable,none,
       "distributed function parameter '%0' of type %1 does not conform to 'Codable'",

lib/Sema/CodeSynthesisDistributedActor.cpp

@@ -175,6 +175,10 @@ AbstractFunctionDecl *TypeChecker::addImplicitDistributedActorRemoteFunction(
   // nonisolated
   remoteFuncDecl->getAttrs().add(new (C) NonisolatedAttr(/*IsImplicit=*/true));
 
+  // nonisolated
+  remoteFuncDecl->getAttrs().add(
+      new (C) NonisolatedAttr(/*IsImplicit=*/true));
+
   // users should never have to access this function directly;
   // it is only invoked from our distributed function thunk if the actor is remote.
   remoteFuncDecl->setUserAccessible(false);

lib/Sema/TypeCheckConcurrency.cpp

@@ -1384,7 +1384,7 @@ namespace {
           decl->diagnose(diag::distributed_actor_isolated_method_note);
         }
       } else if (auto func = dyn_cast<AbstractFunctionDecl>(decl)) {
-        func->diagnose(diag::actor_isolated_sync_func, // FIXME: this is emitted wrongly for self.hello()
+        func->diagnose(diag::actor_isolated_sync_func,
           decl->getDescriptiveKind(),
           decl->getName());
 

test/Distributed/Runtime/distributed_actor_deinit.swift

@@ -13,19 +13,19 @@
 import _Distributed
 
 @available(SwiftStdlib 5.5, *)
-    actor A {}
+actor A {}
 
 @available(SwiftStdlib 5.5, *)
 distributed actor DA {
   init(transport: ActorTransport) {
-    defer { transport.actorReady(self) }
+    defer { transport.actorReady(self) } // FIXME(distributed): rdar://81783599 this should be injected automatically
   }
 }
 
 @available(SwiftStdlib 5.5, *)
 distributed actor DA_userDefined {
   init(transport: ActorTransport) {
-    defer { transport.actorReady(self) }
+    defer { transport.actorReady(self) } // FIXME(distributed): rdar://81783599 this should be injected automatically
   }
 
   deinit {}
@@ -34,7 +34,7 @@ distributed actor DA_userDefined {
 @available(SwiftStdlib 5.5, *)
 distributed actor DA_userDefined2 {
   init(transport: ActorTransport) {
-    defer { transport.actorReady(self) }
+    defer { transport.actorReady(self) } // FIXME(distributed): rdar://81783599 this should be injected automatically
   }
 
   deinit {
@@ -49,7 +49,7 @@ distributed actor DA_state {
   var age = 42
 
   init(transport: ActorTransport) {
-    defer { transport.actorReady(self) }
+    defer { transport.actorReady(self) } // FIXME(distributed): rdar://81783599 this should be injected automatically
   }
 
   deinit {

test/Distributed/Runtime/distributed_actor_dynamic_remote_func.swift

@@ -7,12 +7,17 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// REQUIRES: rdar78290608
+// FIXME(distributed): remote functions dont seem to work on windows?
+// XFAIL: OS=windows-msvc
 
 import _Distributed
 
 @available(SwiftStdlib 5.5, *)
 distributed actor LocalWorker {
+  init(transport: ActorTransport) {
+    defer { transport.actorReady(self) } // FIXME(distributed): rdar://81783599 this should be injected automatically
+  }
+
   distributed func function() async throws -> String {
     "local:"
   }
@@ -25,13 +30,13 @@ distributed actor LocalWorker {
 @available(SwiftStdlib 5.5, *)
 extension LocalWorker {
   @_dynamicReplacement(for: _remote_function())
-  // TODO: @_remoteDynamicReplacement(for: function()) - could be a nicer spelling, hiding that we use dynamic under the covers
+  // TODO(distributed): @_remoteDynamicReplacement(for: function()) - could be a nicer spelling, hiding that we use dynamic under the covers
   func _cluster_remote_function() async throws -> String {
     "\(#function):"
   }
 
   @_dynamicReplacement(for: _remote_echo(name:))
-  // TODO: @_remoteDynamicReplacement(for: hello(name:)) - could be a nicer spelling, hiding that we use dynamic under the covers
+  // TODO(distributed): @_remoteDynamicReplacement(for: hello(name:)) - could be a nicer spelling, hiding that we use dynamic under the covers
   func _cluster_remote_echo(name: String) async throws -> String {
     "\(#function):\(name)"
   }
@@ -95,7 +100,7 @@ func test_remote() async throws {
   let address = ActorAddress(parse: "")
   let transport = FakeTransport()
 
-  let worker = try LocalWorkerresolve(.init(address), using: transport)
+  let worker = try LocalWorker.resolve(.init(address), using: transport)
   let x = try await worker.function()
   print("call: \(x)")
   // CHECK: call: _cluster_remote_function():

test/Distributed/Runtime/distributed_actor_init_local.swift

@@ -8,8 +8,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// REQUIRES: rdar78290608
-
 import _Distributed
 
 @available(SwiftStdlib 5.5, *)

test/Distributed/Runtime/distributed_actor_isRemote.swift

@@ -8,7 +8,8 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// REQUIRES: rdar78290608
+// FIXME(distributed): remote functions dont seem to work on windows?
+// XFAIL: OS=windows-msvc
 
 import _Distributed
 

test/Distributed/Runtime/distributed_actor_local.swift

@@ -4,12 +4,14 @@
 // REQUIRES: concurrency
 // REQUIRES: distributed
 
+// rdar://83859906
+// UNSUPPORTED: OS=windows-msvc
+
+
 // rdar://76038845
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-// REQUIRES: rdar78290608
-
 import _Distributed
 
 @available(SwiftStdlib 5.5, *)

test/Distributed/Runtime/distributed_actor_remote_fieldsDontCrashDeinit.swift

@@ -8,7 +8,6 @@
 // UNSUPPORTED: use_os_stdlib
 // UNSUPPORTED: back_deployment_runtime
 
-
 import _Distributed
 
 @available(SwiftStdlib 5.5, *)

test/Distributed/Runtime/distributed_actor_remote_functions.swift

@@ -149,10 +149,9 @@ struct FakeTransport: ActorTransport {
     fatalError("not implemented:\(#function)")
   }
 
-  func resolve<Act>(_ identity: AnyActorIdentity, as actorType: Act.Type)
-  throws -> Act?
+  func resolve<Act>(_ identity: AnyActorIdentity, as actorType: Act.Type) throws -> Act?
       where Act: DistributedActor {
-    return nil
+    nil
   }
 
   func assignIdentity<Act>(_ actorType: Act.Type) -> AnyActorIdentity