From 0587d4752d8fb814d47a599130d98724d78b1525 Mon Sep 17 00:00:00 2001
From: Marc Mutz <marc.mutz@qt.io>
Date: Fri, 24 Jun 2022 09:23:47 +0200
Subject: Remove uses of Q_ATOMIC_INT{8,16,32}_IS_SUPPORTED

It's always true these days, assert so in qatomic.cpp and
tst_QAtomicInteger.

Update the docs.

Pick-to: 6.4
Change-Id: I3684cff96c1d2e05677314e29514cc279bd6b1a1
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
---
 .../corelib/thread/qatomicint/tst_qatomicint.cpp   | 14 ----------
 .../thread/qatomicinteger/tst_qatomicinteger.cpp   | 32 ++++++++++------------
 2 files changed, 14 insertions(+), 32 deletions(-)

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

diff --git a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
index 3d1b96a896..b99e5f75f5 100644
--- a/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
+++ b/tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
@@ -161,23 +161,19 @@ void tst_QAtomicInt::warningFreeHelper()
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<long int> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<unsigned long int> >();
 
-#ifdef Q_ATOMIC_INT16_IS_SUPPORTED
     warningFreeHelperTemplate<qint16, QBasicAtomicInteger<qint16> >();
     warningFreeHelperTemplate<quint16, QBasicAtomicInteger<quint16> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<qint16> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<quint16> >();
     warningFreeHelperTemplate<qint16, QBasicAtomicInteger<char16_t> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<char16_t> >();
-#endif
 
-#ifdef Q_ATOMIC_INT8_IS_SUPPORTED
     warningFreeHelperTemplate<char, QBasicAtomicInteger<char> >();
     warningFreeHelperTemplate<signed char, QBasicAtomicInteger<signed char> >();
     warningFreeHelperTemplate<unsigned char, QBasicAtomicInteger<unsigned char> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<char> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<signed char> >();
     constexprFunctionsHelperTemplate<QBasicAtomicInteger<unsigned char> >();
-#endif
 
 #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
 #if !defined(__i386__) || (defined(Q_CC_GNU) && defined(__OPTIMIZE__))
@@ -205,17 +201,9 @@ void tst_QAtomicInt::alignment()
     static_assert(alignof(QBasicAtomicInt) == alignof(TypeInStruct<int>));
     static_assert(alignof(QBasicAtomicInt) == alignof(TypeInStruct<int>));
 
-#ifdef Q_ATOMIC_INT32_IS_SUPPORTED
     QCOMPARE(alignof(QBasicAtomicInteger<int>), alignof(TypeInStruct<int>));
-#endif
-
-#ifdef Q_ATOMIC_INT16_IS_SUPPORTED
     QCOMPARE(alignof(QBasicAtomicInteger<short>), alignof(TypeInStruct<short>));
-#endif
-
-#ifdef Q_ATOMIC_INT8_IS_SUPPORTED
     QCOMPARE(alignof(QBasicAtomicInteger<char>), alignof(TypeInStruct<char>));
-#endif
 
 #if !defined(Q_PROCESSOR_X86_32) && defined(Q_ATOMIC_INT64_IS_SUPPORTED)
     // The alignment is different on x86_32
@@ -493,7 +481,6 @@ void tst_QAtomicInt::testAndSet()
         QTEST(atomic.testAndSetOrdered(expected, newval), "result");
     }
 
-#ifdef Q_ATOMIC_INT32_IS_SUPPORTED
     QFETCH(bool, result);
     // the new implementation has the version that loads the current value
 
@@ -528,7 +515,6 @@ void tst_QAtomicInt::testAndSet()
         if (!result)
             QCOMPARE(currentval, value);
     }
-#endif
 }
 
 void tst_QAtomicInt::isFetchAndStoreNative()
diff --git a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
index 61f0697d6c..9d7a71e7e7 100644
--- a/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
+++ b/tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
@@ -32,6 +32,12 @@
 #include <limits.h>
 #include <wchar.h>
 
+#if !defined(Q_ATOMIC_INT8_IS_SUPPORTED)
+#  error "QAtomicInteger for 8-bit types must be supported!"
+#endif
+#if !defined(Q_ATOMIC_INT16_IS_SUPPORTED)
+#  error "QAtomicInteger for 16-bit types must be supported!"
+#endif
 #if !defined(Q_ATOMIC_INT32_IS_SUPPORTED)
 #  error "QAtomicInteger for 32-bit types must be supported!"
 #endif
@@ -40,31 +46,21 @@
 #endif
 
 // always supported types:
+#define TYPE_SUPPORTED_char         1
+#define TYPE_SUPPORTED_uchar        1
+#define TYPE_SUPPORTED_schar        1
+#define TYPE_SUPPORTED_short        1
+#define TYPE_SUPPORTED_ushort       1
+#define TYPE_SUPPORTED_char16_t     1
+#define TYPE_SUPPORTED_wchar_t      1
 #define TYPE_SUPPORTED_int          1
 #define TYPE_SUPPORTED_uint         1
 #define TYPE_SUPPORTED_long         1
 #define TYPE_SUPPORTED_ulong        1
 #define TYPE_SUPPORTED_qptrdiff     1
 #define TYPE_SUPPORTED_quintptr     1
-#if (defined(__SIZEOF_WCHAR_T__) && (__SIZEOF_WCHAR_T__-0) > 2) \
-    || (defined(WCHAR_MAX) && (WCHAR_MAX-0 > 0x10000))
-#  define TYPE_SUPPORTED_wchar_t    1
-#endif
-#define TYPE_SUPPORTED_char32_t   1
+#define TYPE_SUPPORTED_char32_t     1
 
-#ifdef Q_ATOMIC_INT8_IS_SUPPORTED
-#  define TYPE_SUPPORTED_char       1
-#  define TYPE_SUPPORTED_uchar      1
-#  define TYPE_SUPPORTED_schar      1
-#endif
-#ifdef Q_ATOMIC_INT16_IS_SUPPORTED
-#  define TYPE_SUPPORTED_short      1
-#  define TYPE_SUPPORTED_ushort     1
-#  define TYPE_SUPPORTED_char16_t 1
-#  ifndef TYPE_SUPPORTED_wchar_t
-#    define TYPE_SUPPORTED_wchar_t  1
-#  endif
-#endif
 #ifdef Q_ATOMIC_INT64_IS_SUPPORTED
 #  define TYPE_SUPPORTED_qlonglong  1
 #  define TYPE_SUPPORTED_qulonglong 1
-- 
cgit v1.2.3