From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <rodgertq@sourceware.org>
Received: by sourceware.org (Postfix, from userid 2062)
 id 1E4593833017; Wed,  9 Jun 2021 20:47:27 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 1E4593833017
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 r11-8537] libstd++: Only support atomic_ref::wait tests which
 are always lockfree
X-Act-Checkin: gcc
X-Git-Author: Thomas Rodgers <rodgert@appliantology.com>
X-Git-Refname: refs/heads/releases/gcc-11
X-Git-Oldrev: 10d4f283f4177d80cec3c9e8bf447a48cab5bb47
X-Git-Newrev: fe28c123dbdbff41a8e58299335c8b320856cdcd
Message-Id: <20210609204727.1E4593833017@sourceware.org>
Date: Wed,  9 Jun 2021 20:47:27 +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: Wed, 09 Jun 2021 20:47:27 -0000

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

commit r11-8537-gfe28c123dbdbff41a8e58299335c8b320856cdcd
Author: Thomas Rodgers <rodgert@appliantology.com>
Date:   Wed Jun 9 13:44:31 2021 -0700

    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.
    
    (cherry picked from commit eb3a3bb8ce4ce2420919d03a3e9f9a2a4297c4d3)

Diff:
---
 .../testsuite/29_atomics/atomic_ref/wait_notify.cc | 25 ++++++++++++----------
 1 file 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 003b86c85d0..b75e27617f7 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