From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2181) id C1AA03857C75; Tue, 12 Oct 2021 10:59:12 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C1AA03857C75 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 r11-9109] libstdc++: Fix UB in atomic_ref/wait_notify.cc [PR101761] X-Act-Checkin: gcc X-Git-Author: Thomas Rodgers X-Git-Refname: refs/heads/releases/gcc-11 X-Git-Oldrev: ae9e270347ec932310ab16d7521e582e05fecaa2 X-Git-Newrev: 90a4981e0951687056ec4735cfd3043b35a23502 Message-Id: <20211012105912.C1AA03857C75@sourceware.org> Date: Tue, 12 Oct 2021 10:59:12 +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, 12 Oct 2021 10:59:12 -0000 https://gcc.gnu.org/g:90a4981e0951687056ec4735cfd3043b35a23502 commit r11-9109-g90a4981e0951687056ec4735cfd3043b35a23502 Author: Thomas Rodgers Date: Thu Sep 16 14:42:58 2021 -0700 libstdc++: Fix UB in atomic_ref/wait_notify.cc [PR101761] Remove UB in atomic_ref/wait_notify test. Signed-off-by: Thomas Rodgers libstdc++-v3/ChangeLog: PR libstdc++/101761 * testsuite/29_atomics/atomic_ref/wait_notify.cc (test): Use va and vb as arguments to wait/notify, remove unused bb local. (cherry picked from commit f9f1a6efaaeeec06d5c07378734cb8eb47b976a7) Diff: --- libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc | 7 +++---- 1 file changed, 3 insertions(+), 4 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 b75e27617f7..b41d1ac0bb7 100644 --- a/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc +++ b/libstdc++-v3/testsuite/29_atomics/atomic_ref/wait_notify.cc @@ -33,15 +33,14 @@ template if constexpr (std::atomic_ref::is_always_lock_free) { S aa{ va }; - S bb{ vb }; std::atomic_ref a{ aa }; - a.wait(bb); + a.wait(vb); std::thread t([&] { - a.store(bb); + a.store(vb); a.notify_one(); }); - a.wait(aa); + a.wait(va); t.join(); } }