1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Drop constexpr from QAtomicTraits::isLockFree()

Browse Source 
As requested by a ### Qt 6 comment. This then implied a few other
functions weren't constexpr, which broke some tests.

Task-number: QTBUG-85700
Change-Id: I6522a9b2d7a74e117442121400a1d7198d323967
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Edward Welbourne 2020-09-24 16:40:35 +02:00
parent 141fae112a
commit 83cae7c9e3
3 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/corelib/thread/qatomic_cxx11.h
View File

@ -70,10 +70,8 @@ QT_END_NAMESPACE
* QAtomicInteger requires a constexpr answer (defect introduced in Qt 5.0). So * QAtomicInteger requires a constexpr answer (defect introduced in Qt 5.0). So
* we'll err in the side of caution and say it isn't. * we'll err in the side of caution and say it isn't.
*/ */
// ### Qt 6: make non-constexpr (see above)
template <int N> struct QAtomicTraits template <int N> struct QAtomicTraits
{ static constexpr inline bool isLockFree(); }; { static inline bool isLockFree(); };
#define Q_ATOMIC_INT32_IS_SUPPORTED #define Q_ATOMIC_INT32_IS_SUPPORTED
#if ATOMIC_INT_LOCK_FREE == 2 #if ATOMIC_INT_LOCK_FREE == 2
@ -86,7 +84,7 @@ template <int N> struct QAtomicTraits
# define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_ALWAYS_NATIVE
# define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_ALWAYS_NATIVE
template <> constexpr inline bool QAtomicTraits<4>::isLockFree() template <> inline bool QAtomicTraits<4>::isLockFree()
{ return true; } { return true; }
#elif ATOMIC_INT_LOCK_FREE == 1 #elif ATOMIC_INT_LOCK_FREE == 1
# define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
@ -98,7 +96,7 @@ template <> constexpr inline bool QAtomicTraits<4>::isLockFree()
# define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
# define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
template <> constexpr inline bool QAtomicTraits<4>::isLockFree() template <> inline bool QAtomicTraits<4>::isLockFree()
{ return false; } { return false; }
#else #else
# define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NEVER_NATIVE # define Q_ATOMIC_INT_REFERENCE_COUNTING_IS_NEVER_NATIVE
@ -110,7 +108,7 @@ template <> constexpr inline bool QAtomicTraits<4>::isLockFree()
# define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_NEVER_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_STORE_IS_NEVER_NATIVE
# define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_NEVER_NATIVE # define Q_ATOMIC_INT32_FETCH_AND_ADD_IS_NEVER_NATIVE
template <> constexpr inline bool QAtomicTraits<4>::isLockFree() template <> inline bool QAtomicTraits<4>::isLockFree()
{ return false; } { return false; }
#endif #endif
@ -139,7 +137,7 @@ template<> struct QAtomicOpsSupport<1> { enum { IsSupported = 1 }; };
# define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_ALWAYS_NATIVE
# define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_ALWAYS_NATIVE
template <> constexpr inline bool QAtomicTraits<1>::isLockFree() template <> inline bool QAtomicTraits<1>::isLockFree()
{ return true; } { return true; }
#elif ATOMIC_CHAR_LOCK_FREE == 1 #elif ATOMIC_CHAR_LOCK_FREE == 1
# define Q_ATOMIC_INT8_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT8_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
@ -147,7 +145,7 @@ template <> constexpr inline bool QAtomicTraits<1>::isLockFree()
# define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
# define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
template <> constexpr inline bool QAtomicTraits<1>::isLockFree() template <> inline bool QAtomicTraits<1>::isLockFree()
{ return false; } { return false; }
#else #else
# define Q_ATOMIC_INT8_REFERENCE_COUNTING_IS_NEVER_NATIVE # define Q_ATOMIC_INT8_REFERENCE_COUNTING_IS_NEVER_NATIVE
@ -155,7 +153,7 @@ template <> constexpr inline bool QAtomicTraits<1>::isLockFree()
# define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_NEVER_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_STORE_IS_NEVER_NATIVE
# define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_NEVER_NATIVE # define Q_ATOMIC_INT8_FETCH_AND_ADD_IS_NEVER_NATIVE
template <> constexpr bool QAtomicTraits<1>::isLockFree() template <> bool QAtomicTraits<1>::isLockFree()
{ return false; } { return false; }
#endif #endif
@ -167,7 +165,7 @@ template<> struct QAtomicOpsSupport<2> { enum { IsSupported = 1 }; };
# define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_ALWAYS_NATIVE
# define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_ALWAYS_NATIVE
template <> constexpr inline bool QAtomicTraits<2>::isLockFree() template <> inline bool QAtomicTraits<2>::isLockFree()
{ return false; } { return false; }
#elif ATOMIC_SHORT_LOCK_FREE == 1 #elif ATOMIC_SHORT_LOCK_FREE == 1
# define Q_ATOMIC_INT16_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT16_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
@ -175,7 +173,7 @@ template <> constexpr inline bool QAtomicTraits<2>::isLockFree()
# define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
# define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
template <> constexpr inline bool QAtomicTraits<2>::isLockFree() template <> inline bool QAtomicTraits<2>::isLockFree()
{ return false; } { return false; }
#else #else
# define Q_ATOMIC_INT16_REFERENCE_COUNTING_IS_NEVER_NATIVE # define Q_ATOMIC_INT16_REFERENCE_COUNTING_IS_NEVER_NATIVE
@ -183,7 +181,7 @@ template <> constexpr inline bool QAtomicTraits<2>::isLockFree()
# define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_NEVER_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_STORE_IS_NEVER_NATIVE
# define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_NEVER_NATIVE # define Q_ATOMIC_INT16_FETCH_AND_ADD_IS_NEVER_NATIVE
template <> constexpr inline bool QAtomicTraits<2>::isLockFree() template <> inline bool QAtomicTraits<2>::isLockFree()
{ return false; } { return false; }
#endif #endif
@ -196,7 +194,7 @@ template<> struct QAtomicOpsSupport<8> { enum { IsSupported = 1 }; };
# define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_ALWAYS_NATIVE
# define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_ALWAYS_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_ALWAYS_NATIVE
template <> constexpr inline bool QAtomicTraits<8>::isLockFree() template <> inline bool QAtomicTraits<8>::isLockFree()
{ return true; } { return true; }
# elif ATOMIC_LLONG_LOCK_FREE == 1 # elif ATOMIC_LLONG_LOCK_FREE == 1
# define Q_ATOMIC_INT64_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT64_REFERENCE_COUNTING_IS_SOMETIMES_NATIVE
@ -204,7 +202,7 @@ template <> constexpr inline bool QAtomicTraits<8>::isLockFree()
# define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_SOMETIMES_NATIVE
# define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_SOMETIMES_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_SOMETIMES_NATIVE
template <> constexpr inline bool QAtomicTraits<8>::isLockFree() template <> inline bool QAtomicTraits<8>::isLockFree()
{ return false; } { return false; }
# else # else
# define Q_ATOMIC_INT64_REFERENCE_COUNTING_IS_NEVER_NATIVE # define Q_ATOMIC_INT64_REFERENCE_COUNTING_IS_NEVER_NATIVE
@ -212,7 +210,7 @@ template <> constexpr inline bool QAtomicTraits<8>::isLockFree()
# define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_NEVER_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_STORE_IS_NEVER_NATIVE
# define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_NEVER_NATIVE # define Q_ATOMIC_INT64_FETCH_AND_ADD_IS_NEVER_NATIVE
template <> constexpr inline bool QAtomicTraits<8>::isLockFree() template <> inline bool QAtomicTraits<8>::isLockFree()
{ return false; } { return false; }
# endif # endif
#endif #endif
@ -275,7 +273,7 @@ template <typename X> struct QAtomicOps
_q_value.store(newValue, std::memory_order_release); _q_value.store(newValue, std::memory_order_release);
} }
static inline constexpr bool isReferenceCountingNative() noexcept { return isTestAndSetNative(); } static inline bool isReferenceCountingNative() noexcept { return isTestAndSetNative(); }
static inline constexpr bool isReferenceCountingWaitFree() noexcept { return false; } static inline constexpr bool isReferenceCountingWaitFree() noexcept { return false; }
template <typename T> template <typename T>
static inline bool ref(std::atomic<T> &_q_value) static inline bool ref(std::atomic<T> &_q_value)
@ -289,7 +287,7 @@ template <typename X> struct QAtomicOps
return --_q_value != 0; return --_q_value != 0;
} }
static inline constexpr bool isTestAndSetNative() noexcept static inline bool isTestAndSetNative() noexcept
{ return QAtomicTraits<sizeof(X)>::isLockFree(); } { return QAtomicTraits<sizeof(X)>::isLockFree(); }
static inline constexpr bool isTestAndSetWaitFree() noexcept { return false; } static inline constexpr bool isTestAndSetWaitFree() noexcept { return false; }
@ -329,7 +327,7 @@ template <typename X> struct QAtomicOps
return tmp; return tmp;
} }
static inline constexpr bool isFetchAndStoreNative() noexcept { return isTestAndSetNative(); } static inline bool isFetchAndStoreNative() noexcept { return isTestAndSetNative(); }
static inline constexpr bool isFetchAndStoreWaitFree() noexcept { return false; } static inline constexpr bool isFetchAndStoreWaitFree() noexcept { return false; }
template <typename T> template <typename T>
@ -356,7 +354,7 @@ template <typename X> struct QAtomicOps
return _q_value.exchange(newValue, std::memory_order_acq_rel); return _q_value.exchange(newValue, std::memory_order_acq_rel);
} }
static inline constexpr bool isFetchAndAddNative() noexcept { return isTestAndSetNative(); } static inline bool isFetchAndAddNative() noexcept { return isTestAndSetNative(); }
static inline constexpr bool isFetchAndAddWaitFree() noexcept { return false; } static inline constexpr bool isFetchAndAddWaitFree() noexcept { return false; }
template <typename T> static inline template <typename T> static inline

9
tests/auto/corelib/thread/qatomicint/tst_qatomicint.cpp
View File

@ -156,14 +156,15 @@ static void constexprFunctionsHelperTemplate()
{ {
#ifdef Q_COMPILER_CONSTEXPR #ifdef Q_COMPILER_CONSTEXPR
// this is a compile-time test only // this is a compile-time test only
booleanHelper<Atomic::isReferenceCountingNative()>();
booleanHelper<Atomic::isReferenceCountingWaitFree()>(); booleanHelper<Atomic::isReferenceCountingWaitFree()>();
booleanHelper<Atomic::isTestAndSetNative()>();
booleanHelper<Atomic::isTestAndSetWaitFree()>(); booleanHelper<Atomic::isTestAndSetWaitFree()>();
booleanHelper<Atomic::isFetchAndStoreNative()>();
booleanHelper<Atomic::isFetchAndStoreWaitFree()>(); booleanHelper<Atomic::isFetchAndStoreWaitFree()>();
booleanHelper<Atomic::isFetchAndAddNative()>();
booleanHelper<Atomic::isFetchAndAddWaitFree()>(); booleanHelper<Atomic::isFetchAndAddWaitFree()>();
#elif 0 // No longer constexpr
booleanHelper<Atomic::isReferenceCountingNative()>();
booleanHelper<Atomic::isTestAndSetNative()>();
booleanHelper<Atomic::isFetchAndStoreNative()>();
booleanHelper<Atomic::isFetchAndAddNative()>();
#endif #endif
} }

9
tests/auto/corelib/thread/qatomicinteger/tst_qatomicinteger.cpp
View File

@ -198,14 +198,15 @@ void tst_QAtomicIntegerXX::static_checks()
#ifdef Q_COMPILER_CONSTEXPR #ifdef Q_COMPILER_CONSTEXPR
// this is a compile-time test only // this is a compile-time test only
booleanHelper<QAtomicInteger<T>::isReferenceCountingNative()>();
booleanHelper<QAtomicInteger<T>::isReferenceCountingWaitFree()>(); booleanHelper<QAtomicInteger<T>::isReferenceCountingWaitFree()>();
booleanHelper<QAtomicInteger<T>::isTestAndSetNative()>();
booleanHelper<QAtomicInteger<T>::isTestAndSetWaitFree()>(); booleanHelper<QAtomicInteger<T>::isTestAndSetWaitFree()>();
booleanHelper<QAtomicInteger<T>::isFetchAndStoreNative()>();
booleanHelper<QAtomicInteger<T>::isFetchAndStoreWaitFree()>(); booleanHelper<QAtomicInteger<T>::isFetchAndStoreWaitFree()>();
booleanHelper<QAtomicInteger<T>::isFetchAndAddNative()>();
booleanHelper<QAtomicInteger<T>::isFetchAndAddWaitFree()>(); booleanHelper<QAtomicInteger<T>::isFetchAndAddWaitFree()>();
#elif 0 // no longer constexpr
booleanHelper<QAtomicInteger<T>::isReferenceCountingNative()>();
booleanHelper<QAtomicInteger<T>::isTestAndSetNative()>();
booleanHelper<QAtomicInteger<T>::isFetchAndStoreNative()>();
booleanHelper<QAtomicInteger<T>::isFetchAndAddNative()>();
#endif #endif
} }