Move isDistributedRemote out of ActiveActorStatus since it does not need

to be modified in the atomic - it is set once and never changed again

Author: rokhinip

include/swift/Concurrency/Actor.h

@@ -52,8 +52,8 @@ enum : uint32_t {
   /// The actor is ready for deallocation once it stops running
   Zombie_ReadyForDeallocation = 0x3,
 
-  // Bit 3
-  DistributedRemote = 0x8,
+  // Bit 3 is free
+
   // Bit 4
   IsPriorityEscalated = 0x10,
 

include/swift/Reflection/ReflectionContext.h

@@ -203,8 +203,8 @@ class ReflectionContext
     StoredPointer FirstJob;
 
     uint8_t State;
-    bool IsDistributedRemote;
     bool IsPriorityEscalated;
+    bool IsDistributedRemote;
     uint8_t MaxPriority;
 
     bool HasThreadPort;
@@ -1737,13 +1737,12 @@ class ReflectionContext
 
     uint32_t Flags = ActorObj->Status.Flags[0];
     Info.State = Flags & concurrency::ActorFlagConstants::ActorStateMask;
-    Info.IsDistributedRemote =
-        Flags & concurrency::ActorFlagConstants::DistributedRemote;
     Info.IsPriorityEscalated =
         Flags & concurrency::ActorFlagConstants::IsPriorityEscalated;
     Info.MaxPriority =
         (Flags & concurrency::ActorFlagConstants::PriorityMask) >>
         concurrency::ActorFlagConstants::PriorityShift;
+    Info.IsDistributedRemote = ActorObj->IsDistributedRemote;
 
     // Don't read FirstJob when idle.
     if (Info.State != concurrency::ActorFlagConstants::Idle) {

include/swift/Reflection/RuntimeInternals.h

@@ -176,6 +176,7 @@ struct DefaultActorImpl {
   HeapObject<Runtime> HeapObject;
   Job<Runtime> JobStorage;
   ActiveActorStatus Status;
+  bool IsDistributedRemote;
 };
 
 template <typename Runtime>

stdlib/public/Concurrency/Actor.cpp

@@ -589,20 +589,6 @@ class alignas(sizeof(void *) * 2) ActiveActorStatus {
       : Flags(), FirstJob(JobRef()) {}
 #endif
 
-  bool isDistributedRemote() const {
-    return Flags & concurrency::ActorFlagConstants::DistributedRemote;
-  }
-  ActiveActorStatus withDistributedRemote() const {
-#if SWIFT_CONCURRENCY_ENABLE_PRIORITY_ESCALATION
-    return ActiveActorStatus(
-        Flags | concurrency::ActorFlagConstants::DistributedRemote, DrainLock,
-        FirstJob);
-#else
-    return ActiveActorStatus(
-        Flags | concurrency::ActorFlagConstants::DistributedRemote, FirstJob);
-#endif
-  }
-
   bool isIdle() const {
     bool isIdle = (getActorState() == concurrency::ActorFlagConstants::Idle);
     if (isIdle) {
@@ -775,8 +761,8 @@ class alignas(sizeof(void *) * 2) ActiveActorStatus {
     }
     concurrency::trace::actor_state_changed(
         actor, getFirstJob().getRawJob(), getFirstJob().needsPreprocessing(),
-        traceState, isDistributedRemote(), isMaxPriorityEscalated(),
-        static_cast<uint8_t>(getMaxPriority()));
+        traceState, swift_distributed_actor_is_remote((DefaultActor *) actor),
+        isMaxPriorityEscalated(), static_cast<uint8_t>(getMaxPriority()));
   }
 };
 
@@ -843,15 +829,14 @@ class DefaultActorImpl : public HeapObject {
   // enforce alignment. This is space that is available for us to use in
   // the future
   alignas(sizeof(ActiveActorStatus)) char StatusStorage[sizeof(ActiveActorStatus)];
+#endif
+  // TODO(rokhinip): Make this a flagset
+  bool isDistributedRemoteActor;
 
 public:
   /// Properly construct an actor, except for the heap header.
   void initialize(bool isDistributedRemote = false) {
-    ActiveActorStatus status = ActiveActorStatus();
-    if (isDistributedRemote) {
-      status = status.withDistributedRemote();
-    }
-    _status().store(status, std::memory_order_relaxed);
+    this->isDistributedRemoteActor = isDistributedRemote;
 
     SWIFT_TASK_DEBUG_LOG("Creating default actor %p", this);
     concurrency::trace::actor_create(this);
@@ -1774,6 +1759,5 @@ bool swift::swift_distributed_actor_is_remote(DefaultActor *_actor) {
 }
 
 bool DefaultActorImpl::isDistributedRemote() {
-  auto state = _status().load(std::memory_order_relaxed);
-  return state.isDistributedRemote();
+  return this->isDistributedRemoteActor;
 }