From 41ccd683f0002d7b5127aafc00dcd59e7837f0ab Mon Sep 17 00:00:00 2001 From: Jonathan Wakely Date: Mon, 25 Apr 2022 18:25:07 +0100 Subject: [PATCH] libstdc++: Add std::atomic(nullptr_t) constructor (LWG 3661) This DR was approved at the February 2022 plenary. libstdc++-v3/ChangeLog: * include/bits/shared_ptr_atomic.h (atomic): Add constructor for constant initialization from nullptr_t. * testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc: Check for new constructor. --- libstdc++-v3/include/bits/shared_ptr_atomic.h | 4 ++++ .../testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc | 2 ++ 2 files changed, 6 insertions(+) diff --git a/libstdc++-v3/include/bits/shared_ptr_atomic.h b/libstdc++-v3/include/bits/shared_ptr_atomic.h index 9e4df7da7f8b..ff86432f0b40 100644 --- a/libstdc++-v3/include/bits/shared_ptr_atomic.h +++ b/libstdc++-v3/include/bits/shared_ptr_atomic.h @@ -573,6 +573,10 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr atomic() noexcept = default; + // _GLIBCXX_RESOLVE_LIB_DEFECTS + // 3661. constinit atomic> a(nullptr); should work + constexpr atomic(nullptr_t) noexcept : atomic() { } + atomic(shared_ptr<_Tp> __r) noexcept : _M_impl(std::move(__r)) { } diff --git a/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc b/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc index 1f97224bf6aa..a1902745a3ef 100644 --- a/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc +++ b/libstdc++-v3/testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc @@ -18,6 +18,8 @@ // Check constexpr constructor. constinit std::atomic> a; +// LWG 3661. constinit atomic> a(nullptr); should work +constinit std::atomic> a2 = nullptr; void test_is_lock_free() -- 2.47.2