From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2062) id 8931B3858D1E; Tue, 14 Feb 2023 01:47:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8931B3858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676339243; bh=fJbpwo73KQmSRxRBwx/m2YDlfik58Vj69s90M2s55y4=; h=From:To:Subject:Date:From; b=d1XJibuGKT94ZnTm1QruSb3gub+RlA50jj6X4sNxpu9QlH1VZDMRMW9KFBVac62z/ Fs33PtUNMIDOvgTJXMssLv+/YVVo6P+4X7YP5itiJL9Fgq/S1GNAxIqZbTSHPcvd/w TIPFEBwdhS+nrBZXfVHwRyPWiXfQdR9s18HICCHY= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Thomas Rodgers To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org Subject: [gcc r13-5976] libstdc++: Add missing free functions for atomic_flag [PR103934] X-Act-Checkin: gcc X-Git-Author: Thomas W Rodgers X-Git-Refname: refs/heads/master X-Git-Oldrev: ae7197818d6ed6123f1a294efa4ed9b3014d7ff5 X-Git-Newrev: a8d769045b43e8509490362865a85cb31a855ccf Message-Id: <20230214014723.8931B3858D1E@sourceware.org> Date: Tue, 14 Feb 2023 01:47:23 +0000 (GMT) List-Id: https://gcc.gnu.org/g:a8d769045b43e8509490362865a85cb31a855ccf commit r13-5976-ga8d769045b43e8509490362865a85cb31a855ccf Author: Thomas W Rodgers Date: Fri Feb 10 09:35:11 2023 -0800 libstdc++: Add missing free functions for atomic_flag [PR103934] This patch adds - atomic_flag_test atomic_flag_test_explicit Which were missed when commit 491ba6 introduced C++20 atomic flag test. libstdc++-v3/ChangeLog: PR libstdc++/103934 * include/std/atomic (atomic_flag_test): Add. (atomic_flag_test_explicit): Add. * testsuite/29_atomics/atomic_flag/test/explicit.cc: Add test case to cover missing atomic_flag free functions. * testsuite/29_atomics/atomic_flag/test/implicit.cc: Likewise. Diff: --- libstdc++-v3/include/std/atomic | 20 +++++++++++++++++ .../29_atomics/atomic_flag/test/explicit.cc | 26 +++++++++++++++++++++- .../29_atomics/atomic_flag/test/implicit.cc | 26 +++++++++++++++++++++- 3 files changed, 70 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 1c27c8c41e1..1edd3ae16fa 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -1214,6 +1214,26 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION memory_order __m) noexcept { return __a->test_and_set(__m); } +#if __cpp_lib_atomic_flag_test + inline bool + atomic_flag_test(const atomic_flag* __a) noexcept + { return __a->test(); } + + inline bool + atomic_flag_test(const volatile atomic_flag* __a) noexcept + { return __a->test(); } + + inline bool + atomic_flag_test_explicit(const atomic_flag* __a, + memory_order __m) noexcept + { return __a->test(__m); } + + inline bool + atomic_flag_test_explicit(const volatile atomic_flag* __a, + memory_order __m) noexcept + { return __a->test(__m); } +#endif + inline void atomic_flag_clear_explicit(atomic_flag* __a, memory_order __m) noexcept { __a->clear(__m); } diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc index 380bd36ac47..fc8d6589707 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/explicit.cc @@ -22,7 +22,8 @@ #include #include -int main() +void +test01() { using namespace std; @@ -38,3 +39,26 @@ int main() VERIFY( ! af.test(memory_order_acquire) ); VERIFY( ! caf.test(memory_order_acquire) ); } + +void +test02() +{ + using namespace std; + + atomic_flag af{true}; + const atomic_flag& caf = af; + + VERIFY( atomic_flag_test_explicit(&af, memory_order_acquire) ); + VERIFY( atomic_flag_test_explicit(&caf, memory_order_acquire) ); + af.clear(memory_order_release); + VERIFY( ! atomic_flag_test_explicit(&af, memory_order_acquire) ); + VERIFY( ! atomic_flag_test_explicit(&caf, memory_order_acquire) ); +} + +int +main() +{ + test01(); + test02(); + return 0; +} diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc index cce873fa553..2840055433f 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_flag/test/implicit.cc @@ -22,7 +22,8 @@ #include #include -int main() +void +test01() { using namespace std; @@ -38,3 +39,26 @@ int main() VERIFY( ! af.test() ); VERIFY( ! caf.test() ); } + +void +test02() +{ + using namespace std; + + atomic_flag af{true}; + const atomic_flag& caf = af; + + VERIFY( atomic_flag_test(&af) ); + VERIFY( atomic_flag_test(&caf) ); + af.clear(memory_order_release); + VERIFY( ! atomic_flag_test(&af) ); + VERIFY( ! atomic_flag_test(&caf) ); +} + +int +main() +{ + test01(); + test02(); + return 0; +}