From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by sourceware.org (Postfix) with ESMTPS id 28F243858403 for ; Tue, 26 Apr 2022 12:24:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 28F243858403 Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-141-FC7yjI0dNcu_GzELuiODYQ-1; Tue, 26 Apr 2022 08:24:38 -0400 X-MC-Unique: FC7yjI0dNcu_GzELuiODYQ-1 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.rdu2.redhat.com [10.11.54.7]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 178B583397B; Tue, 26 Apr 2022 12:24:38 +0000 (UTC) Received: from localhost (unknown [10.33.36.192]) by smtp.corp.redhat.com (Postfix) with ESMTP id A3E1114A4FA5; Tue, 26 Apr 2022 12:24:30 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Add std::atomic(nullptr_t) constructor (LWG 3661) Date: Tue, 26 Apr 2022 13:24:29 +0100 Message-Id: <20220426122429.2075326-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.85 on 10.11.54.7 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-12.4 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_LOW, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=unavailable autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 26 Apr 2022 12:24:43 -0000 Tested powerpc64le-linux, pushed to trunk. -- >8 -- 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 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() -- 2.34.1