Port from QAtomic::load() to loadRelaxed()

Semi-automated, just needed ~20 manual fixes:

$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)load\(\)/$1loadRelaxed\(\)/g' -i \{\} +
$ find \( -iname \*.cpp -or -iname \*.h \) -exec perl -pe 's/(\.|->)store\(/$1storeRelaxed\(/g' -i \{\} +

It can be easily improved (e.g. for store check that there are no commas
after the opening parens). The most common offender is QLibrary::load,
and some code using std::atomic directly.

Change-Id: I07c38a3c8ed32c924ef4999e85c7e45cf48f0f6c
Reviewed-by: Marc Mutz <marc.mutz@kdab.com>
 
 

5 files changed, 84 insertions, 84 deletions

diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index 6ae2aab5b9..7db7d71b1f 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -91,7 +91,7 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to 1 (owned)
         QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(1) }, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(!array.ref.isStatic());
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
@@ -99,19 +99,19 @@ void tst_QArrayData::referenceCounting()
 #endif
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), 2);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), 2);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 2);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 1);
 
         QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         // Now would be a good time to free/release allocated data
     }
@@ -121,17 +121,17 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to 0 (non-sharable)
         QArrayData array = { { Q_BASIC_ATOMIC_INITIALIZER(0) }, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         QVERIFY(!array.ref.isStatic());
         QVERIFY(!array.ref.isSharable());
 
         QVERIFY(!array.ref.ref());
         // Reference counting fails, data should be copied
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         QVERIFY(!array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), 0);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), 0);
 
         // Free/release data
     }
@@ -141,7 +141,7 @@ void tst_QArrayData::referenceCounting()
         // Reference counting initialized to -1 (static read-only data)
         QArrayData array = { Q_REFCOUNT_INITIALIZE_STATIC, 0, 0, 0, 0 };
 
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
         QVERIFY(array.ref.isStatic());
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
@@ -149,10 +149,10 @@ void tst_QArrayData::referenceCounting()
 #endif
 
         QVERIFY(array.ref.ref());
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
         QVERIFY(array.ref.deref());
-        QCOMPARE(array.ref.atomic.load(), -1);
+        QCOMPARE(array.ref.atomic.loadRelaxed(), -1);
 
     }
 }
@@ -168,8 +168,8 @@ void tst_QArrayData::sharedNullEmpty()
     QVERIFY(empty->ref.isStatic());
     QVERIFY(empty->ref.isShared());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
 #if !defined(QT_NO_UNSHARABLE_CONTAINERS)
     QVERIFY(null->ref.isSharable());
@@ -179,14 +179,14 @@ void tst_QArrayData::sharedNullEmpty()
     QVERIFY(null->ref.ref());
     QVERIFY(empty->ref.ref());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
     QVERIFY(null->ref.deref());
     QVERIFY(empty->ref.deref());
 
-    QCOMPARE(null->ref.atomic.load(), -1);
-    QCOMPARE(empty->ref.atomic.load(), -1);
+    QCOMPARE(null->ref.atomic.loadRelaxed(), -1);
+    QCOMPARE(empty->ref.atomic.loadRelaxed(), -1);
 
     QVERIFY(null != empty);
 
diff --git a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
index 9b45e17a28..f305d63d46 100644
--- a/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
+++ b/tests/auto/corelib/tools/qcontiguouscache/tst_qcontiguouscache.cpp
@@ -244,7 +244,7 @@ public:
         return *this;
     }
 
-    int refCount() const { return d->ref.load(); }
+    int refCount() const { return d->ref.loadRelaxed(); }
 private:
     RefCountingClassData *d;
 };
diff --git a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
index b943b04e23..ea94cc2999 100644
--- a/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
+++ b/tests/auto/corelib/tools/qscopedpointer/tst_qscopedpointer.cpp
@@ -327,7 +327,7 @@ struct RefCounted
 
     ~RefCounted()
     {
-        QVERIFY( ref.load() == 0 );
+        QVERIFY( ref.loadRelaxed() == 0 );
         instanceCount.deref();
     }
 
@@ -369,13 +369,13 @@ void scopedPointerComparisonTest(const A1 &a1, const A2 &a2, const B &b)
 
 void tst_QScopedPointer::comparison()
 {
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         RefCounted *a = new RefCounted;
         RefCounted *b = new RefCounted;
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         QScopedPointer<RefCounted> pa1(a);
         QScopedPointer<RefCounted> pa2(a);
@@ -387,16 +387,16 @@ void tst_QScopedPointer::comparison()
 
         pa2.take();
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         RefCounted *a = new RefCounted[42];
         RefCounted *b = new RefCounted[43];
 
-        QCOMPARE( RefCounted::instanceCount.load(), 85 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
 
         QScopedArrayPointer<RefCounted> pa1(a);
         QScopedArrayPointer<RefCounted> pa2(a);
@@ -406,10 +406,10 @@ void tst_QScopedPointer::comparison()
 
         pa2.take();
 
-        QCOMPARE( RefCounted::instanceCount.load(), 85 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 85 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 
     {
         // QScopedSharedPointer is an internal helper class -- it is unsupported!
@@ -417,42 +417,42 @@ void tst_QScopedPointer::comparison()
         RefCounted *a = new RefCounted;
         RefCounted *b = new RefCounted;
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         QSharedDataPointer<RefCounted> pa1(a);
         QSharedDataPointer<RefCounted> pa2(a);
         QSharedDataPointer<RefCounted> pb(b);
 
-        QCOMPARE( a->ref.load(), 2 );
-        QCOMPARE( b->ref.load(), 1 );
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( a->ref.loadRelaxed(), 2 );
+        QCOMPARE( b->ref.loadRelaxed(), 1 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
 
         scopedPointerComparisonTest(pa1, pa2, pb);
 
-        QCOMPARE( RefCounted::instanceCount.load(), 2 );
+        QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 2 );
     }
 
-    QCOMPARE( RefCounted::instanceCount.load(), 0 );
+    QCOMPARE( RefCounted::instanceCount.loadRelaxed(), 0 );
 }
 
 void tst_QScopedPointer::array()
 {
-    int instCount = RefCounted::instanceCount.load();
+    int instCount = RefCounted::instanceCount.loadRelaxed();
     {
         QScopedArrayPointer<RefCounted> array;
         array.reset(new RefCounted[42]);
-        QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 42, RefCounted::instanceCount.loadRelaxed());
     }
-    QCOMPARE(instCount, RefCounted::instanceCount.load());
+    QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
     {
         QScopedArrayPointer<RefCounted> array(new RefCounted[42]);
-        QCOMPARE(instCount + 42, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 42, RefCounted::instanceCount.loadRelaxed());
         array.reset(new RefCounted[28]);
-        QCOMPARE(instCount + 28, RefCounted::instanceCount.load());
+        QCOMPARE(instCount + 28, RefCounted::instanceCount.loadRelaxed());
         array.reset(0);
-        QCOMPARE(instCount, RefCounted::instanceCount.load());
+        QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
     }
-    QCOMPARE(instCount, RefCounted::instanceCount.load());
+    QCOMPARE(instCount, RefCounted::instanceCount.loadRelaxed());
 }
 
 
diff --git a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
index d0bc237a5d..187b73eeec 100644
--- a/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
+++ b/tests/auto/corelib/tools/qsharedpointer/tst_qsharedpointer.cpp
@@ -294,8 +294,8 @@ void tst_QSharedPointer::basics()
         QVERIFY(! (ptr == otherData));
         QVERIFY(! (otherData == ptr));
     }
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.load() == 1);
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.load() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.loadRelaxed() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.loadRelaxed() == 1);
 
     {
         // create another object:
@@ -307,8 +307,8 @@ void tst_QSharedPointer::basics()
 
         // otherData is deleted here
     }
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.load() == 1);
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.load() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.loadRelaxed() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.loadRelaxed() == 1);
 
     {
         // create a copy:
@@ -325,8 +325,8 @@ void tst_QSharedPointer::basics()
         QCOMPARE(copy.get(), aData);
         QVERIFY(copy == aData);
     }
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.load() == 1);
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.load() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.loadRelaxed() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.loadRelaxed() == 1);
 
     {
         // create a weak reference:
@@ -358,8 +358,8 @@ void tst_QSharedPointer::basics()
         QCOMPARE(strong.data(), aData);
         QCOMPARE(strong.get(), aData);
     }
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.load() == 1);
-    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.load() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->weakref.loadRelaxed() == 1);
+    QVERIFY(!refCountData(ptr) || refCountData(ptr)->strongref.loadRelaxed() == 1);
 
     // aData is deleted here
 }
@@ -843,15 +843,15 @@ void tst_QSharedPointer::upCast()
         QVERIFY(baseptr == derivedptr);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QWeakPointer<DerivedData> derivedptr = qWeakPointerCast<DerivedData>(baseptr);
         QVERIFY(baseptr == derivedptr);
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QWeakPointer<Data> weakptr = baseptr;
@@ -859,16 +859,16 @@ void tst_QSharedPointer::upCast()
         QVERIFY(baseptr == derivedptr);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QSharedPointer<DerivedData> derivedptr = baseptr.staticCast<DerivedData>();
         QVERIFY(baseptr == derivedptr);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 }
 
 class OtherObject: public QObject
@@ -1297,8 +1297,8 @@ void tst_QSharedPointer::dynamicCast()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QWeakPointer<Data> weakptr = baseptr;
@@ -1307,8 +1307,8 @@ void tst_QSharedPointer::dynamicCast()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QSharedPointer<DerivedData> derivedptr = baseptr.dynamicCast<DerivedData>();
@@ -1316,8 +1316,8 @@ void tst_QSharedPointer::dynamicCast()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 }
 
 void tst_QSharedPointer::dynamicCastDifferentPointers()
@@ -1332,8 +1332,8 @@ void tst_QSharedPointer::dynamicCastDifferentPointers()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QWeakPointer<Data> weakptr = baseptr;
@@ -1342,8 +1342,8 @@ void tst_QSharedPointer::dynamicCastDifferentPointers()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QSharedPointer<DiffPtrDerivedData> derivedptr = baseptr.dynamicCast<DiffPtrDerivedData>();
@@ -1351,8 +1351,8 @@ void tst_QSharedPointer::dynamicCastDifferentPointers()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         Stuffing *nakedptr = dynamic_cast<Stuffing *>(baseptr.data());
@@ -1377,8 +1377,8 @@ void tst_QSharedPointer::dynamicCastVirtualBase()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QWeakPointer<Data> weakptr = baseptr;
@@ -1387,8 +1387,8 @@ void tst_QSharedPointer::dynamicCastVirtualBase()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QSharedPointer<VirtualDerived> derivedptr = baseptr.dynamicCast<VirtualDerived>();
@@ -1396,8 +1396,8 @@ void tst_QSharedPointer::dynamicCastVirtualBase()
         QCOMPARE(derivedptr.data(), aData);
         QCOMPARE(static_cast<Data *>(derivedptr.data()), baseptr.data());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 }
 
 void tst_QSharedPointer::dynamicCastFailure()
@@ -1409,15 +1409,15 @@ void tst_QSharedPointer::dynamicCastFailure()
         QSharedPointer<DerivedData> derivedptr = qSharedPointerDynamicCast<DerivedData>(baseptr);
         QVERIFY(derivedptr.isNull());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 
     {
         QSharedPointer<DerivedData> derivedptr = baseptr.dynamicCast<DerivedData>();
         QVERIFY(derivedptr.isNull());
     }
-    QCOMPARE(int(refCountData(baseptr)->weakref.load()), 1);
-    QCOMPARE(int(refCountData(baseptr)->strongref.load()), 1);
+    QCOMPARE(int(refCountData(baseptr)->weakref.loadRelaxed()), 1);
+    QCOMPARE(int(refCountData(baseptr)->strongref.loadRelaxed()), 1);
 }
 
 void tst_QSharedPointer::dynamicCastFailureNoLeak()
@@ -1786,8 +1786,8 @@ void tst_QSharedPointer::creating()
         QCOMPARE(Data::destructorCounter, 1);
 
         // valgrind will complain here if something happened to the pointer
-        QVERIFY(d->weakref.load() == 1);
-        QVERIFY(d->strongref.load() == 0);
+        QVERIFY(d->weakref.loadRelaxed() == 1);
+        QVERIFY(d->strongref.loadRelaxed() == 0);
     }
     safetyCheck();
 
@@ -2022,7 +2022,7 @@ void tst_QSharedPointer::threadStressTest()
     for (int r = 0; r < 5; ++r) {
         QVector<QThread*> allThreads(6 * qMax(strongThreadCount, weakThreadCount) + 3, 0);
         QSharedPointer<ThreadData> base = QSharedPointer<ThreadData>(new ThreadData(&counter));
-        counter.store(0);
+        counter.storeRelaxed(0);
 
         // set the pointers
         for (int i = 0; i < strongThreadCount; ++i) {
@@ -2056,8 +2056,8 @@ void tst_QSharedPointer::threadStressTest()
         // verify that the count is the right range
         int minValue = strongThreadCount;
         int maxValue = strongThreadCount + weakThreadCount;
-        QVERIFY(counter.load() >= minValue);
-        QVERIFY(counter.load() <= maxValue);
+        QVERIFY(counter.loadRelaxed() >= minValue);
+        QVERIFY(counter.loadRelaxed() <= maxValue);
     }
 }
 
diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
index 11c255b184..3256130472 100644
--- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp
+++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp
@@ -2882,7 +2882,7 @@ void tst_QVector::detachThreadSafety() const
     struct : QThread {
         void run() override
         {
-            QVector<T> copy(*detachThreadSafetyData<T>()->load());
+            QVector<T> copy(*detachThreadSafetyData<T>()->loadRelaxed());
             QVERIFY(!copy.isDetached());
             detachThreadSafetyLock.release();
             detachThreadSafetyLock.acquire(100);