From 3a72496b5c43484a94882440993b0ca0cb842d8a Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@kdab.com>
Date: Fri, 16 Jul 2021 09:57:56 +0200
Subject: tests: fix some -Wvolatile

C++20 deprecated compound volatile statements such as pre- and
post-increments, to stress that they're not atomic. So instead of

    volatile i;
    ~~~~;
    ++i;

you're now supposed to write

    volatile i;
    ~~~~;
    int j = i; // volatile load
    ++j;
    i = j; // volatile store

which matches more closely what hardware does.

Instead of fixing every use of volatile pre- or post-increment in this
fashion individually, and realising that probably a few more Qt
modules will have the same kind of code patterns in them, write
QtPrivate functions to do the job centrally.

Change-Id: I838097bd484ef2118c071726963f103c080d2ba5
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 tests/auto/corelib/thread/qmutex/CMakeLists.txt                 | 6 ------
 tests/auto/corelib/thread/qmutex/tst_qmutex.cpp                 | 9 +++++----
 tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt         | 2 ++
 tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp | 9 +++------
 4 files changed, 10 insertions(+), 16 deletions(-)

(limited to 'tests/auto/corelib/thread')

diff --git a/tests/auto/corelib/thread/qmutex/CMakeLists.txt b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
index 41b7b1da68..1412036fc9 100644
--- a/tests/auto/corelib/thread/qmutex/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qmutex/CMakeLists.txt
@@ -7,12 +7,6 @@
 qt_internal_add_test(tst_qmutex
     SOURCES
         tst_qmutex.cpp
-)
-
-## Scopes:
-#####################################################################
-
-qt_internal_extend_target(tst_qmutex CONDITION WIN32
     PUBLIC_LIBRARIES
         Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
index fb080a1a12..c00ddea908 100644
--- a/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
+++ b/tests/auto/corelib/thread/qmutex/tst_qmutex.cpp
@@ -36,6 +36,7 @@
 #include <qmutex.h>
 #include <qthread.h>
 #include <qwaitcondition.h>
+#include <private/qvolatile_p.h>
 
 class tst_QMutex : public QObject
 {
@@ -1191,9 +1192,9 @@ void tst_QMutex::tryLockDeadlock()
         {
             for (int i = 0; i < 100000; ++i) {
                 if (mut.tryLock(0)) {
-                    if ((++tryLockDeadlockCounter) != 1)
+                    if (QtPrivate::volatilePreIncrement(tryLockDeadlockCounter) != 1)
                         ++tryLockDeadlockFailureCount;
-                    if ((--tryLockDeadlockCounter) != 0)
+                    if (QtPrivate::volatilePreDecrement(tryLockDeadlockCounter) != 0)
                         ++tryLockDeadlockFailureCount;
                     mut.unlock();
                 }
@@ -1210,9 +1211,9 @@ void tst_QMutex::tryLockDeadlock()
 
     for (int i = 0; i < 100000; ++i) {
         mut.lock();
-        if ((++tryLockDeadlockCounter) != 1)
+        if (QtPrivate::volatilePreIncrement(tryLockDeadlockCounter) != 1)
             ++tryLockDeadlockFailureCount;
-        if ((--tryLockDeadlockCounter) != 0)
+        if (QtPrivate::volatilePreDecrement(tryLockDeadlockCounter) != 0)
             ++tryLockDeadlockFailureCount;
         mut.unlock();
     }
diff --git a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
index 4b81229024..a99001425e 100644
--- a/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
+++ b/tests/auto/corelib/thread/qreadwritelock/CMakeLists.txt
@@ -7,4 +7,6 @@
 qt_internal_add_test(tst_qreadwritelock
     SOURCES
         tst_qreadwritelock.cpp
+    PUBLIC_LIBRARIES
+        Qt::CorePrivate
 )
diff --git a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
index ca282e2723..a6c0ebae22 100644
--- a/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
+++ b/tests/auto/corelib/thread/qreadwritelock/tst_qreadwritelock.cpp
@@ -34,6 +34,7 @@
 #include <qmutex.h>
 #include <qthread.h>
 #include <qwaitcondition.h>
+#include <private/qvolatile_p.h>
 
 #ifdef Q_OS_UNIX
 #include <unistd.h>
@@ -587,12 +588,8 @@ public:
             if(count)
                 qFatal("Non-zero count at start of write! (%d)",count );
 //            printf(".");
-            int i;
-            for(i=0; i<maxval; ++i) {
-                volatile int lc=count;
-                ++lc;
-                count=lc;
-            }
+            for (int i = 0; i < maxval; ++i)
+                QtPrivate::volatilePreIncrement(count);
             count=0;
             testRwlock.unlock();
             msleep(ulong(waitTime));
-- 
cgit v1.2.3