From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2062) id B68093858D33; Tue, 14 Feb 2023 01:59:43 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B68093858D33 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1676339983; bh=+LFEpjLNc6m0ivPeAwEkQSP1NSM5jYT/a95JlfnwOgU=; h=From:To:Subject:Date:From; b=U8StcBETcRRrfOe5TdKSXUG8aYR6T43BijMsC08f6k6tLPEnv+Nyawg+3gRhQ0um/ vsCsrcY7WwlTnikH91DFCSbRpbOuyhwPDSuZPMOpJ8a3Ken0A8ebRE/PpmdzDa6Nd8 ODfY6a1Fraw6TeXpqaPF3jE62g0XmlUNwsyPN19Q= 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 r12-9172] libstdc++: Add missing free functions for atomic_flag [PR103934] X-Act-Checkin: gcc X-Git-Author: Thomas W Rodgers X-Git-Refname: refs/heads/releases/gcc-12 X-Git-Oldrev: 35c6d02981b06202c7cd137662b866fe3d1c4da6 X-Git-Newrev: dec869c95562c0b1255f770e68e7ea72e7e92681 Message-Id: <20230214015943.B68093858D33@sourceware.org> Date: Tue, 14 Feb 2023 01:59:43 +0000 (GMT) List-Id: https://gcc.gnu.org/g:dec869c95562c0b1255f770e68e7ea72e7e92681 commit r12-9172-gdec869c95562c0b1255f770e68e7ea72e7e92681 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. (cherry picked from commit a8d769045b43e8509490362865a85cb31a855ccf) 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 cf5d7309334..9e042d8ce44 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -1216,6 +1216,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 f4a42cce930..6cb2d1bfdf8 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 6dc83d16da7..9919732bc8a 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; +}