diff options
| author | Oliver Wolff <oliver.wolff@qt.io> | 2022-07-27 10:20:39 +0200 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2022-08-03 16:04:39 +0000 |
| commit | 69df10ace6b3f0cf47ddc4d9e794e44519be02f3 (patch) | |
| tree | 746030166c33957779116dce9747eeb36de25118 | |
| parent | 24ccadbee0b8733615c46edc62c383a6202ebcda (diff) | |
Disable constinit for MSVC compilers
https://developercommunity.visualstudio.com/t/C:-constinit-for-an-optional-fails-if-/1406069
does not only affect constinit thread_local but also constinit in
general on MSVC compilers when C++20 is being used. So disable the
feature for these compilers in general for now.
This commit amends d9531593a248e19f7da7862b2870a6af2f413e75
Fixes: QTBUG-105234
Change-Id: I1855f0857d85487895460fc7c56675fb864bfa73
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
(cherry picked from commit 51acd4708296de4392232271b3d6c5d067bdffad)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
| -rw-r--r-- | src/corelib/global/qglobal.h | 9 | ||||
| -rw-r--r-- | src/corelib/kernel/qobject.cpp | 2 | ||||
| -rw-r--r-- | src/corelib/kernel/qproperty.cpp | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/src/corelib/global/qglobal.h b/src/corelib/global/qglobal.h index 8c01367bb9..9249becc27 100644 --- a/src/corelib/global/qglobal.h +++ b/src/corelib/global/qglobal.h @@ -1265,10 +1265,11 @@ constexpr std::underlying_type_t<Enum> qToUnderlying(Enum e) noexcept #endif #ifdef __cpp_constinit -# define Q_CONSTINIT constinit # if defined(Q_CC_MSVC) && !defined(Q_CC_CLANG) // https://developercommunity.visualstudio.com/t/C:-constinit-for-an-optional-fails-if-/1406069 -# define Q_THREAD_LOCAL_CONSTINIT +# define Q_CONSTINIT +# else +# define Q_CONSTINIT constinit # endif #elif defined(__has_cpp_attribute) && __has_cpp_attribute(clang::require_constant_initialization) # define Q_CONSTINIT [[clang::require_constant_initialization]] @@ -1278,10 +1279,6 @@ constexpr std::underlying_type_t<Enum> qToUnderlying(Enum e) noexcept # define Q_CONSTINIT #endif -#ifndef Q_THREAD_LOCAL_CONSTINIT -# define Q_THREAD_LOCAL_CONSTINIT Q_CONSTINIT -#endif - template <typename T> inline T *qGetPtrHelper(T *ptr) noexcept { return ptr; } template <typename Ptr> inline auto qGetPtrHelper(Ptr &ptr) noexcept -> decltype(ptr.get()) { static_assert(noexcept(ptr.get()), "Smart d pointers for Q_DECLARE_PRIVATE must have noexcept get()"); return ptr.get(); } diff --git a/src/corelib/kernel/qobject.cpp b/src/corelib/kernel/qobject.cpp index e07631d001..a7f48b5c59 100644 --- a/src/corelib/kernel/qobject.cpp +++ b/src/corelib/kernel/qobject.cpp @@ -2415,7 +2415,7 @@ public: { return std::find(locations.begin(), locations.end(), method) != locations.end(); } }; -Q_THREAD_LOCAL_CONSTINIT static thread_local FlaggedDebugSignatures flaggedSignatures = {}; +Q_CONSTINIT static thread_local FlaggedDebugSignatures flaggedSignatures = {}; } // unnamed namespace const char *qFlagLocation(const char *method) diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index 482ed3bf35..22422995fe 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -162,7 +162,7 @@ struct QPropertyDelayedNotifications } }; -Q_THREAD_LOCAL_CONSTINIT static thread_local QBindingStatus bindingStatus; +Q_CONSTINIT static thread_local QBindingStatus bindingStatus; /*! \since 6.2 |