From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id 74FDC3857C41; Tue, 26 Apr 2022 12:24:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 74FDC3857C41 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Jonathan Wakely To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r12-8267] libstdc++: Add std::atomic(nullptr_t) constructor (LWG 3661) X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: e3c5e8360b4e4799e1e2daf74282629248690f23 X-Git-Newrev: 41ccd683f0002d7b5127aafc00dcd59e7837f0ab Message-Id: <20220426122407.74FDC3857C41@sourceware.org> Date: Tue, 26 Apr 2022 12:24:07 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 12:24:07 -0000 https://gcc.gnu.org/g:41ccd683f0002d7b5127aafc00dcd59e7837f0ab commit r12-8267-g41ccd683f0002d7b5127aafc00dcd59e7837f0ab Author: Jonathan Wakely Date: Mon Apr 25 18:25:07 2022 +0100 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. Diff: --- libstdc++-v3/include/bits/shared_ptr_atomic.h | 4 ++++ libstdc++-v3/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 9e4df7da7f8..ff86432f0b4 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 1f97224bf6a..a1902745a3e 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()