diff options
| author | Thomas Rodgers <rodgert@twrodgers.com> | 2021-12-09 15:35:25 -0800 |
|---|---|---|
| committer | Thomas Rodgers <rodgert@twrodgers.com> | 2021-12-09 17:57:03 -0800 |
| commit | 38c60e5075f89265a560eab166d43247624a7535 (patch) | |
| tree | 7dbdf231a957b4cf2454054b2f93d4854f41e2ff | |
| parent | 35a4fe8091896529a19a7c2c2a32e69f3b5efddb (diff) | |
| download | gcc-38c60e5075f89265a560eab166d43247624a7535.zip gcc-38c60e5075f89265a560eab166d43247624a7535.tar.gz gcc-38c60e5075f89265a560eab166d43247624a7535.tar.bz2 | |
libstdc++: Make atomic<T*>::wait() const [PR102994]
This was an oversight in the original commit adding wait/notify
to atomic<T>.
libstdc++-v3/ChangeLog:
PR libstdc++/102994
* include/bits/atomic_base.h (__atomic_base<_PTp*>::wait()):
Add const qualifier.
* include/std/atomic (atomic<_Tp*>::wait(), atomic_wait()):
Likewise.
* testsuite/29_atomics/atomic/wait_notify/102994.cc:
New test.
| -rw-r--r-- | libstdc++-v3/include/bits/atomic_base.h | 2 | ||||
| -rw-r--r-- | libstdc++-v3/include/std/atomic | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc | 19 |
3 files changed, 24 insertions, 5 deletions
diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h index 9e18aad..a104adc 100644 --- a/libstdc++-v3/include/bits/atomic_base.h +++ b/libstdc++-v3/include/bits/atomic_base.h @@ -893,7 +893,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION #if __cpp_lib_atomic_wait _GLIBCXX_ALWAYS_INLINE void wait(__pointer_type __old, - memory_order __m = memory_order_seq_cst) noexcept + memory_order __m = memory_order_seq_cst) const noexcept { std::__atomic_wait_address_v(&_M_p, __old, [__m, this] diff --git a/libstdc++-v3/include/std/atomic b/libstdc++-v3/include/std/atomic index 936dd50..9b827b4 100644 --- a/libstdc++-v3/include/std/atomic +++ b/libstdc++-v3/include/std/atomic @@ -646,9 +646,9 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION __cmpexch_failure_order(__m)); } -#if __cpp_lib_atomic_wait +#if __cpp_lib_atomic_wait void - wait(__pointer_type __old, memory_order __m = memory_order_seq_cst) noexcept + wait(__pointer_type __old, memory_order __m = memory_order_seq_cst) const noexcept { _M_b.wait(__old, __m); } // TODO add const volatile overload @@ -1434,12 +1434,12 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION template<typename _Tp> inline void - atomic_notify_one(atomic<_Tp>* __a) noexcept + atomic_notify_one(const atomic<_Tp>* __a) noexcept { __a->notify_one(); } template<typename _Tp> inline void - atomic_notify_all(atomic<_Tp>* __a) noexcept + atomic_notify_all(const atomic<_Tp>* __a) noexcept { __a->notify_all(); } #endif // __cpp_lib_atomic_wait diff --git a/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc new file mode 100644 index 0000000..9d92ff9 --- /dev/null +++ b/libstdc++-v3/testsuite/29_atomics/atomic/wait_notify/102994.cc @@ -0,0 +1,19 @@ +// { dg-options "-std=gnu++20" } +// { dg-do compile { target c++20 } } +// { dg-require-gthreads "" } + +#include <atomic> + +void +test1(const std::atomic<char*>& a, char* p) +{ + a.wait(p); +} + +void +test2(const std::atomic<int>* a, int v) +{ + std::atomic_wait(a, v); + std::atomic_notify_one(a); + std::atomic_notify_all(a); +} |