From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2062) id 29B11398547C; Tue, 8 Jun 2021 23:02:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 29B11398547C 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 r11-8528] libstdc++: Fix Wrong param type in :atomic_ref<_Tp*>::wait [PR100889] X-Act-Checkin: gcc X-Git-Author: Thomas Rodgers X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: 7976eccf5fe2796f4035de44a607ebd29d57e108 X-Git-Newrev: d7462945387b33744f665d1aa33ba1cec79c03b0 Message-Id: <20210608230232.29B11398547C@sourceware.org> Date: Tue, 8 Jun 2021 23:02:32 +0000 (GMT) X-BeenThere: libstdc++-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 08 Jun 2021 23:02:32 -0000 https://gcc.gnu.org/g:d7462945387b33744f665d1aa33ba1cec79c03b0 commit r11-8528-gd7462945387b33744f665d1aa33ba1cec79c03b0 Author: Thomas Rodgers 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. (cherry picked from commit 25e5ecdf82b49977e86bfaded236fb34af2705ed) 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 +template + void + test (S va, S vb) + { + S aa{ va }; + S bb{ vb }; + std::atomic_ref a{ aa }; + a.wait(bb); + std::thread t([&] + { + a.store(bb); + a.notify_one(); + }); + a.wait(aa); + t.join(); + } + int main () { + test(0, 42); + test(0, 42); + test(0u, 42u); + test(0.0f, 42.0f); + test(0.0, 42.0); + test(nullptr, reinterpret_cast(42)); + struct S{ int i; }; - S aa{ 0 }; - S bb{ 42 }; - - std::atomic_ref 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{ 0 }, S{ 42 }); return 0; }