public inbox for libstdc++-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-1312] libstdc++: Fix Wrong param type in :atomic_ref<_Tp*>::wait [PR100889]
@ 2021-06-08 23:01 Thomas Rodgers
0 siblings, 0 replies; only message in thread
From: Thomas Rodgers @ 2021-06-08 23:01 UTC (permalink / raw)
To: gcc-cvs, libstdc++-cvs
https://gcc.gnu.org/g:25e5ecdf82b49977e86bfaded236fb34af2705ed
commit r12-1312-g25e5ecdf82b49977e86bfaded236fb34af2705ed
Author: Thomas Rodgers <rodgert@appliantology.com>
Date: Tue Jun 8 15:51:53 2021 -0700
libstdc++: Fix Wrong param type in :atomic_ref<_Tp*>::wait [PR100889]
libstdc++-v3/ChangeLog:
PR libstdc++/100889
* include/bits/atomic_base.h (atomic_ref<_Tp*>::wait):
Change parameter type from _Tp to _Tp*.
* testsuite/29_atomics/atomic_ref/wait_notify.cc: Extend
coverage of types tested.
Diff:
---
libstdc++-v3/include/bits/atomic_base.h | 2 +-
.../testsuite/29_atomics/atomic_ref/wait_notify.cc | 38 ++++++++++++++--------
2 files changed, 26 insertions(+), 14 deletions(-)
diff --git a/libstdc++-v3/include/bits/atomic_base.h b/libstdc++-v3/include/bits/atomic_base.h
index 029b8ad65a9..20cf1343c58 100644
--- a/libstdc++-v3/include/bits/atomic_base.h
+++ b/libstdc++-v3/include/bits/atomic_base.h
@@ -1870,7 +1870,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
#if __cpp_lib_atomic_wait
_GLIBCXX_ALWAYS_INLINE void
- wait(_Tp __old, memory_order __m = memory_order_seq_cst) const noexcept
+ wait(_Tp* __old, memory_order __m = memory_order_seq_cst) const noexcept
{ __atomic_impl::wait(_M_ptr, __old, __m); }
// TODO add const volatile overload
diff --git a/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc b/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc
index 2fd31304222..003b86c85d0 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc
@@ -26,22 +26,34 @@
#include <testsuite_hooks.h>
+template<typename S>
+ void
+ test (S va, S vb)
+ {
+ S aa{ va };
+ S bb{ vb };
+ std::atomic_ref<S> a{ aa };
+ a.wait(bb);
+ std::thread t([&]
+ {
+ a.store(bb);
+ a.notify_one();
+ });
+ a.wait(aa);
+ t.join();
+ }
+
int
main ()
{
+ test<int>(0, 42);
+ test<long>(0, 42);
+ test<unsigned>(0u, 42u);
+ test<float>(0.0f, 42.0f);
+ test<double>(0.0, 42.0);
+ test<void*>(nullptr, reinterpret_cast<void*>(42));
+
struct S{ int i; };
- S aa{ 0 };
- S bb{ 42 };
-
- std::atomic_ref<S> a{ aa };
- VERIFY( a.load().i == aa.i );
- a.wait(bb);
- std::thread t([&]
- {
- a.store(bb);
- a.notify_one();
- });
- a.wait(aa);
- t.join();
+ test<S>(S{ 0 }, S{ 42 });
return 0;
}
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-06-08 23:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 23:01 [gcc r12-1312] libstdc++: Fix Wrong param type in :atomic_ref<_Tp*>::wait [PR100889] Thomas Rodgers
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).