QQmlTypePrivate: do not abuse volatile for atomic

Instead of using volatile, use proper atomics for thread safe access.
Moreover, we don't gain anything by using bitfields here, as we have
space for 4 bools due to alignment reasons anyway. Therefore using bools
does not create any overhead.

Change-Id: I390acd935656efcb20265ddb67fa0059f3f18118
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 6 insertions, 4 deletions

diff --git a/src/qml/qml/qqmltype_p_p.h b/src/qml/qml/qqmltype_p_p.h
index c94ac8c130..8cce5b7910 100644
--- a/src/qml/qml/qqmltype_p_p.h
+++ b/src/qml/qml/qqmltype_p_p.h
@@ -58,6 +58,8 @@
 #include <private/qqmlpropertycache_p.h>
 #include <private/qqmlmetatype_p.h>
 
+#include <QAtomicInteger>
+
 QT_BEGIN_NAMESPACE
 
 class QQmlTypePrivate : public QQmlRefCount
@@ -166,10 +168,10 @@ public:
     const QMetaObject *baseMetaObject;
 
     int index;
-    mutable volatile bool isSetup:1;
-    mutable volatile bool isEnumFromCacheSetup:1;
-    mutable volatile bool isEnumFromBaseSetup:1;
-    mutable bool haveSuperType:1;
+    mutable QAtomicInteger<bool> isSetup;
+    mutable QAtomicInteger<bool> isEnumFromCacheSetup;
+    mutable QAtomicInteger<bool> isEnumFromBaseSetup;
+    mutable bool haveSuperType;
     mutable QList<QQmlProxyMetaObject::ProxyData> metaObjects;
     mutable QStringHash<int> enums;
     mutable QStringHash<int> scopedEnumIndex; // maps from enum name to index in scopedEnums