aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Rodgers <rodgert@appliantology.com>2021-06-09 13:44:31 -0700
committerThomas Rodgers <rodgert@appliantology.com>2021-06-09 13:46:03 -0700
commiteb3a3bb8ce4ce2420919d03a3e9f9a2a4297c4d3 (patch)
tree9b54b10907c204d74f388de8c813a84420cf7832
parentd4faa36e7540c573c5dc17850bcd938d0900b2e9 (diff)
downloadgcc-eb3a3bb8ce4ce2420919d03a3e9f9a2a4297c4d3.zip
gcc-eb3a3bb8ce4ce2420919d03a3e9f9a2a4297c4d3.tar.gz
gcc-eb3a3bb8ce4ce2420919d03a3e9f9a2a4297c4d3.tar.bz2
libstd++: Only support atomic_ref::wait tests which are always lockfree
Fixes a regression on arm32 targets. libstdc++-v3/ChangeLog: * testsuite/29_atomics/atomic_ref/wait_notify.cc: Guard test logic with constexpr check for is_always_lock_free.
-rw-r--r--libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc25
1 files changed, 14 insertions, 11 deletions
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 003b86c..b75e276 100644
--- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc
+++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc
@@ -30,17 +30,20 @@ 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();
+ if constexpr (std::atomic_ref<S>::is_always_lock_free)
+ {
+ 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