From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id B13583852C4F; Mon, 12 Dec 2022 14:00:55 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B13583852C4F DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670853655; bh=hGLJmePBuRVA+1i//+CQ7a4rj0R8HsoutGcpSCJOOTk=; h=From:To:Subject:Date:From; b=Q5Ql6CNkkZpwP7TwyLQxPq0YhTtiYlbBNCJK/KBO8/Wo1G1G7w1c3uwQ1U+3fuJDe /bS1auwWCavl3BIrJ/0ui9Dpip+A7gJ4DxirqdFHn1GF+mB5Zv6bjTFX3D9P7iyp6P O2aKm3PQUosHCbCMF5P3f6MuXLn9Gz2DxDLDfAlQ= 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 r13-4612] libstdc++: Define atomic lock-free type aliases for C++20 [PR98034] X-Act-Checkin: gcc X-Git-Author: Jonathan Wakely X-Git-Refname: refs/heads/master X-Git-Oldrev: 2327d9331430777006008ab3b051afe2b4fc15bd X-Git-Newrev: 320ac807da125e6dc952b3d4abf02daeead88d44 Message-Id: <20221212140055.B13583852C4F@sourceware.org> Date: Mon, 12 Dec 2022 14:00:55 +0000 (GMT) List-Id: https://gcc.gnu.org/g:320ac807da125e6dc952b3d4abf02daeead88d44 commit r13-4612-g320ac807da125e6dc952b3d4abf02daeead88d44 Author: Jonathan Wakely Date: Mon Dec 12 12:49:40 2022 +0000 libstdc++: Define atomic lock-free type aliases for C++20 [PR98034] libstdc++-v3/ChangeLog: PR libstdc++/98034 * include/std/atomic (__cpp_lib_atomic_lock_free_type_aliases): Define macro. (atomic_signed_lock_free, atomic_unsigned_lock_free): Define aliases. * include/std/version (__cpp_lib_atomic_lock_free_type_aliases): Define macro. * testsuite/29_atomics/atomic/lock_free_aliases.cc: New test. Diff: --- libstdc++-v3/include/std/atomic | 17 +++++++++++ libstdc++-v3/include/std/version | 1 + .../29_atomics/atomic/lock_free_aliases.cc | 34 ++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 356f1458f44..857f9270049 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -1727,6 +1727,23 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION using __atomic_ref<_Tp>::operator=; }; +#define __cpp_lib_atomic_lock_free_type_aliases 201907L +#ifdef _GLIBCXX_HAVE_PLATFORM_WAIT + using atomic_signed_lock_free + = atomic>; + using atomic_unsigned_lock_free + = atomic>; +#elif ATOMIC_INT_LOCK_FREE || !(ATOMIC_LONG_LOCK_FREE || ATOMIC_CHAR_LOCK_FREE) + using atomic_signed_lock_free = atomic; + using atomic_unsigned_lock_free = atomic; +#elif ATOMIC_LONG_LOCK_FREE + using atomic_signed_lock_free = atomic; + using atomic_unsigned_lock_free = atomic; +#elif ATOMIC_CHAR_LOCK_FREE + using atomic_signed_lock_free = atomic; + using atomic_unsigned_lock_free = atomic; +#endif + #endif // C++2a /// @} group atomics diff --git a/libstdc++-v3/include/std/version b/libstdc++-v3/include/std/version index 3c7c440bd80..61718ebad74 100644 --- a/libstdc++-v3/include/std/version +++ b/libstdc++-v3/include/std/version @@ -187,6 +187,7 @@ #define __cpp_lib_assume_aligned 201811L #define __cpp_lib_atomic_flag_test 201907L #define __cpp_lib_atomic_float 201711L +#define __cpp_lib_atomic_lock_free_type_aliases 201907L #define __cpp_lib_atomic_ref 201806L #define __cpp_lib_atomic_value_initialization 201911L #define __cpp_lib_bind_front 201907L diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc b/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc new file mode 100644 index 00000000000..02c4ccc3aa3 --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic/lock_free_aliases.cc @@ -0,0 +1,34 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } + +#include + +#ifndef __cpp_lib_atomic_lock_free_type_aliases +# error "Feature test macro for lock-free type aliases is missing in " +#elif __cpp_lib_atomic_lock_free_type_aliases != 201907L +# error "Feature test macro for lock-free type aliases has wrong value in " +#endif + +template +constexpr bool is_atomic_specialization = false; +template +constexpr bool is_atomic_specialization> = true; + +// The type aliases atomic_signed_lock_free and atomic_unsigned_lock_free +// name specializations of atomic +static_assert( is_atomic_specialization ); +static_assert( is_atomic_specialization ); + +#include + +// ... whose template arguments are integral types, +static_assert( std::is_integral_v ); +static_assert( std::is_integral_v ); + +// ... respectively signed and unsigned, +static_assert( std::is_signed_v ); +static_assert( std::is_unsigned_v ); + +// and whose is_always_lock_free property is true. +static_assert( std::atomic_signed_lock_free::is_always_lock_free ); +static_assert( std::atomic_unsigned_lock_free::is_always_lock_free );