From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id E134B3857C7D; Fri, 21 Jan 2022 13:21:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E134B3857C7D 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-6794] libstdc++: Fix constexpr constructor for atomic> X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: caca8eddd9356777f5fe28454eb083b1779adc26 X-Git-Newrev: 7d47aae7cd4bb4dbf1e59a52c2a3f127151c8fab Message-Id: <20220121132133.E134B3857C7D@sourceware.org> Date: Fri, 21 Jan 2022 13:21:33 +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: Fri, 21 Jan 2022 13:21:34 -0000 https://gcc.gnu.org/g:7d47aae7cd4bb4dbf1e59a52c2a3f127151c8fab commit r12-6794-g7d47aae7cd4bb4dbf1e59a52c2a3f127151c8fab Author: Jonathan Wakely Date: Fri Jan 21 11:55:22 2022 +0000 libstdc++: Fix constexpr constructor for atomic> libstdc++-v3/ChangeLog: * include/bits/shared_ptr_atomic.h (_Sp_atomic::_Atomic_count): Add constexpr. (_Sp_atomic::_M_ptr): Add default member-initializer. * testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc: Check constant initialization. * testsuite/20_util/weak_ptr/atomic_weak_ptr.cc: Likewise. Diff: --- libstdc++-v3/include/bits/shared_ptr_atomic.h | 4 ++-- libstdc++-v3/testsuite/20_util/shared_ptr/atomic/atomic_shared_ptr.cc | 3 +++ libstdc++-v3/testsuite/20_util/weak_ptr/atomic_weak_ptr.cc | 3 +++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/bits/shared_ptr_atomic.h b/libstdc++-v3/include/bits/shared_ptr_atomic.h index 35f781dc9a0..9e4df7da7f8 100644 --- a/libstdc++-v3/include/bits/shared_ptr_atomic.h +++ b/libstdc++-v3/include/bits/shared_ptr_atomic.h @@ -357,7 +357,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION // Ensure we can use the LSB as the lock bit. static_assert(alignof(remove_pointer_t) > 1); - _Atomic_count() : _M_val(0) { } + constexpr _Atomic_count() noexcept = default; explicit _Atomic_count(__count_type&& __c) noexcept @@ -457,7 +457,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION static constexpr uintptr_t _S_lock_bit{1}; }; - typename _Tp::element_type* _M_ptr; + typename _Tp::element_type* _M_ptr = nullptr; _Atomic_count _M_refcount; static typename _Atomic_count::pointer 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 725e7ba5031..1f97224bf6a 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 @@ -16,6 +16,9 @@ #include +// Check constexpr constructor. +constinit std::atomic> a; + void test_is_lock_free() { diff --git a/libstdc++-v3/testsuite/20_util/weak_ptr/atomic_weak_ptr.cc b/libstdc++-v3/testsuite/20_util/weak_ptr/atomic_weak_ptr.cc index e394e5562b9..b38cea768c8 100644 --- a/libstdc++-v3/testsuite/20_util/weak_ptr/atomic_weak_ptr.cc +++ b/libstdc++-v3/testsuite/20_util/weak_ptr/atomic_weak_ptr.cc @@ -8,6 +8,9 @@ #include #include +// Check constexpr constructor. +constinit std::atomic> a; + void test_is_lock_free() {