Fix static initialization of std::atomic_flag; Fixes PR#37226. Thanks to Ricky Zhou...

llvm-svn: 330828

diff --git a/libcxx/include/atomic b/libcxx/include/atomic
index f55e28f..34a2a58 100644 (file)
--- a/libcxx/include/atomic
+++ b/libcxx/include/atomic
@@ -1741,7 +1741,7 @@ typedef struct atomic_flag
     atomic_flag() _NOEXCEPT : __a_() {}
 #endif // _LIBCPP_CXX03_LANG
 
-    _LIBCPP_INLINE_VISIBILITY
+    _LIBCPP_INLINE_VISIBILITY _LIBCPP_CONSTEXPR
     atomic_flag(bool __b) _NOEXCEPT : __a_(__b) {} // EXTENSION
 
 #ifndef _LIBCPP_CXX03_LANG

diff --git a/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp b/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp
index d7b172c..1a8b320 100644 (file)
--- a/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp
+++ b/libcxx/test/libcxx/atomics/atomics.flag/init_bool.pass.cpp
@@ -18,8 +18,15 @@
 #include <atomic>
 #include <cassert>
 
+ // Ensure that static initialization happens; this is PR#37226
+extern std::atomic_flag global;
+struct X { X() { global.test_and_set(); }};
+X x;
+std::atomic_flag global = ATOMIC_FLAG_INIT;
+
 int main()
 {
+    assert(global.test_and_set() == 1);
     {
         std::atomic_flag f(false);
         assert(f.test_and_set() == 0);