Allow creating Singlelon during Singleton destruction back again

ref:53c837a1fa0289db60812b95b6ac96be23ae018d

2 files changed, 21 insertions, 1 deletions

diff --git a/util/system/atexit.cpp b/util/system/atexit.cpp
index 5ae7a21e233..7fafad95a6a 100644
--- a/util/system/atexit.cpp
+++ b/util/system/atexit.cpp
@@ -81,9 +81,10 @@ namespace {
     alignas(TAtExit) static char atExitMem[sizeof(TAtExit)];
 
     static void OnExit() {
-        if (TAtExit* const atExit = atExitPtr.exchange(nullptr)) {
+        if (TAtExit* const atExit = atExitPtr.load()) {
             atExit->Finish();
             atExit->~TAtExit();
+            atExitPtr.store(nullptr);
         }
     }
 
diff --git a/util/system/atexit_ut.cpp b/util/system/atexit_ut.cpp
index 953f4328110..f093c2b86b4 100644
--- a/util/system/atexit_ut.cpp
+++ b/util/system/atexit_ut.cpp
@@ -1,6 +1,7 @@
 #include <library/cpp/testing/unittest/registar.h>
 
 #include "atexit.h"
+#include <util/generic/singleton.h>
 
 #include <errno.h>
 
@@ -83,3 +84,21 @@ class TAtExitTest: public TTestBase {
 };
 
 UNIT_TEST_SUITE_REGISTRATION(TAtExitTest);
+
+Y_UNIT_TEST_SUITE(TestAtExit) {
+
+    Y_UNIT_TEST(CreateUponDestruction) {
+
+        struct T1 {
+        };
+
+        struct T2 {
+            ~T2() {
+                Singleton<T1>();
+            }
+        };
+
+        Singleton<T2>();
+
+    }
+}