From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rodgertq@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2062)
 id 8C5703858D3C; Thu, 16 Sep 2021 21:48:41 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8C5703858D3C
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Type: text/plain; charset="utf-8"
From: Thomas Rodgers <rodgertq@gcc.gnu.org>
To: gcc-cvs@gcc.gnu.org, libstdc++-cvs@gcc.gnu.org
Subject: [gcc r12-3587] libstdc++: Fix UB in atomic_ref/wait_notify.cc
 [PR101761]
X-Act-Checkin: gcc
X-Git-Author: Thomas Rodgers <rodgert@twrodgers.com>
X-Git-Refname: refs/heads/master
X-Git-Oldrev: 93b5a667100caa40ecd10f54c0fcdac04f3bc0d7
X-Git-Newrev: f9f1a6efaaeeec06d5c07378734cb8eb47b976a7
Message-Id: <20210916214841.8C5703858D3C@sourceware.org>
Date: Thu, 16 Sep 2021 21:48:41 +0000 (GMT)
X-BeenThere: libstdc++-cvs@gcc.gnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libstdc++-cvs mailing list <libstdc++-cvs.gcc.gnu.org>
List-Unsubscribe: <https://gcc.gnu.org/mailman/options/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=unsubscribe>
List-Archive: <https://gcc.gnu.org/pipermail/libstdc++-cvs/>
List-Help: <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=help>
List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/libstdc++-cvs>,
 <mailto:libstdc++-cvs-request@gcc.gnu.org?subject=subscribe>
X-List-Received-Date: Thu, 16 Sep 2021 21:48:41 -0000

https://gcc.gnu.org/g:f9f1a6efaaeeec06d5c07378734cb8eb47b976a7

commit r12-3587-gf9f1a6efaaeeec06d5c07378734cb8eb47b976a7
Author: Thomas Rodgers <rodgert@twrodgers.com>
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 <trodgers@redhat.com>
    
    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.

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<typename S>
     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);
+      a.wait(vb);
       std::thread t([&]
         {
-	  a.store(bb);
+	  a.store(vb);
 	  a.notify_one();
         });
-      a.wait(aa);
+      a.wait(va);
       t.join();
     }
   }