fix(patch): [sc-870] Fix deadlock in the release build. (#118)

Author: ser-0xff

Sources/DistributedSystem/DistributedSystem.swift

@@ -1033,32 +1033,36 @@ public class DistributedSystem: DistributedActorSystem, @unchecked Sendable {
         // and it will entail a nested call to the resignID() for that actor,
         // and we will have a recursive lock.
         // Returning ActorInfo from under the lock let as release an actor instance outside the lock.
-        _ = lock.withLock { () -> ActorInfo? in
-            if let actorInfo = self.actors[id] {
+        let actorInfo: ActorInfo? = lock.withLock {
+            if let idx = self.actors.index(forKey: id) {
+                let actorInfo = self.actors[idx].value
                 switch actorInfo {
                 case .remoteClient:
                     fatalError("internal error: unexpected actor state")
                 default:
-                    self.actors.removeValue(forKey: id)
+                    self.actors.remove(at: idx)
                     return actorInfo
                 }
             }
             return nil
         }
+        _ = actorInfo
 
         if (id.channelID == 0) && ((id.instanceID & EndpointIdentifier.serviceFlag) != 0) {
             let clientEndpointID = id.makeClientEndpoint()
-            _ = lock.withLock { () -> ActorInfo? in
-                if let actorInfo = self.actors[clientEndpointID] {
+            let actorInfo: ActorInfo? = lock.withLock {
+                if let idx = self.actors.index(forKey: clientEndpointID) {
+                    let actorInfo = self.actors[idx].value
                     if case .newClient = actorInfo {
-                        self.actors.removeValue(forKey: clientEndpointID)
+                        self.actors.remove(at: idx)
                         return actorInfo
                     } else {
                         logger.error("internal error: unexpected actor state for \(clientEndpointID)")
                     }
                 }
                 return nil
             }
+            _ = actorInfo
         }
     }
 

Tests/DistributedSystemTests/GenericDistributedActor.swift

@@ -8,7 +8,7 @@ private distributed actor TestServiceEndpoint: ServiceEndpoint {
     public typealias ActorSystem = DistributedSystem
     public typealias SerializationRequirement = Transferable
 
-    static var serviceName = "TestService"
+    static let serviceName = "TestService"
 
     distributed func handleRequest() async throws {
         let clientEndpointID = id.makeClientEndpoint()