SERVER-51165 SyncUnique Use atomic swap in setter, and AtomicWord<T*>

1 files changed, 3 insertions, 5 deletions

diff --git a/src/mongo/db/service_context.h b/src/mongo/db/service_context.h
index 7299d459190..f59d31ddd49 100644
--- a/src/mongo/db/service_context.h
+++ b/src/mongo/db/service_context.h
@@ -626,13 +626,11 @@ private:
         }
 
         void set(std::unique_ptr<T> p) {
-            T* old = get();
-            _ptr.store(reinterpret_cast<uintptr_t>(p.release()));
-            delete old;
+            delete _ptr.swap(p.release());
         }
 
         T* get() const {
-            return reinterpret_cast<T*>(_ptr.load());
+            return _ptr.load();
         }
 
         T* operator->() const {
@@ -648,7 +646,7 @@ private:
         }
 
     private:
-        AtomicWord<uintptr_t> _ptr{0};
+        AtomicWord<T*> _ptr{nullptr};
     };
 
     class ClientObserverHolder {