QML: Port QV4::CompiledData::ParameterType to new special integer bitfield

Task-number: QTBUG-99545
Change-Id: I515aa7a605accc4b45f9dd4918dd6bfb6e116379
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
Reviewed-by: Sami Shalayel <sami.shalayel@qt.io>
(cherry picked from commit 2642058df8429cd593d0c7adf45a818a42fc0d88)

3 files changed, 29 insertions, 15 deletions

diff --git a/src/qml/common/qv4compileddata_p.h b/src/qml/common/qv4compileddata_p.h
index cb9e85d8ea..333878ef25 100644
--- a/src/qml/common/qv4compileddata_p.h
+++ b/src/qml/common/qv4compileddata_p.h
@@ -288,11 +288,26 @@ enum class BuiltinType : unsigned int {
 
 struct ParameterType
 {
-    union {
-        quint32 _dummy;
-        quint32_le_bitfield<0, 1> indexIsBuiltinType;
-        quint32_le_bitfield<1, 31> typeNameIndexOrBuiltinType;
-    };
+    void set(bool indexIsBuiltinType, quint32 typeNameIndexOrBuiltinType)
+    {
+        m_data.set<IndexIsBuiltinTypeField>(indexIsBuiltinType ? 1 : 0);
+        m_data.set<TypeNameIndexOrBuiltinTypeField>(typeNameIndexOrBuiltinType);
+    }
+
+    bool indexIsBuiltinType() const
+    {
+        return m_data.get<IndexIsBuiltinTypeField>() != 0;
+    }
+
+    quint32 typeNameIndexOrBuiltinType() const
+    {
+        return m_data.get<TypeNameIndexOrBuiltinTypeField>();
+    }
+
+private:
+    using IndexIsBuiltinTypeField = quint32_le_bitfield_member<0, 1>;
+    using TypeNameIndexOrBuiltinTypeField = quint32_le_bitfield_member<1, 31>;
+    quint32_le_bitfield_union<IndexIsBuiltinTypeField, TypeNameIndexOrBuiltinTypeField> m_data;
 };
 static_assert(sizeof(ParameterType) == 4, "ParameterType structure needs to have the expected size to be binary compatible on disk when generated by host compiler and loaded by target");
 
diff --git a/src/qml/compiler/qqmlirbuilder.cpp b/src/qml/compiler/qqmlirbuilder.cpp
index cf8b6c1e8a..b5210e6510 100644
--- a/src/qml/compiler/qqmlirbuilder.cpp
+++ b/src/qml/compiler/qqmlirbuilder.cpp
@@ -106,20 +106,18 @@ bool Parameter::init(QV4::CompiledData::Parameter *param, const QV4::Compiler::J
 
 bool Parameter::initType(QV4::CompiledData::ParameterType *paramType, const QV4::Compiler::JSUnitGenerator *stringGenerator, int typeNameIndex)
 {
-    paramType->indexIsBuiltinType = false;
-    paramType->typeNameIndexOrBuiltinType = 0;
     const QString typeName = stringGenerator->stringForIndex(typeNameIndex);
     auto builtinType = stringToBuiltinType(typeName);
     if (builtinType == QV4::CompiledData::BuiltinType::InvalidBuiltin) {
-        if (typeName.isEmpty() || !typeName.at(0).isUpper())
+        if (typeName.isEmpty() || !typeName.at(0).isUpper()) {
+            paramType->set(false, 0);
             return false;
-        paramType->indexIsBuiltinType = false;
-        paramType->typeNameIndexOrBuiltinType = typeNameIndex;
+        }
         Q_ASSERT(quint32(typeNameIndex) < (1u << 31));
+        paramType->set(false, typeNameIndex);
     } else {
-        paramType->indexIsBuiltinType = true;
-        paramType->typeNameIndexOrBuiltinType = static_cast<quint32>(builtinType);
         Q_ASSERT(quint32(builtinType) < (1u << 31));
+        paramType->set(true, static_cast<quint32>(builtinType));
     }
     return true;
 }
diff --git a/src/qml/qml/qqmlpropertycachecreator_p.h b/src/qml/qml/qqmlpropertycachecreator_p.h
index 3c85b8c3b4..c1f9175876 100644
--- a/src/qml/qml/qqmlpropertycachecreator_p.h
+++ b/src/qml/qml/qqmlpropertycachecreator_p.h
@@ -735,13 +735,14 @@ template <typename ObjectContainer>
 inline QMetaType QQmlPropertyCacheCreator<ObjectContainer>::metaTypeForParameter(const QV4::CompiledData::ParameterType &param,
                                                                            QString *customTypeName)
 {
-    if (param.indexIsBuiltinType) {
+    if (param.indexIsBuiltinType()) {
         // built-in type
-        return metaTypeForPropertyType(static_cast<QV4::CompiledData::BuiltinType>(int(param.typeNameIndexOrBuiltinType)));
+        return metaTypeForPropertyType(
+                static_cast<QV4::CompiledData::BuiltinType>(param.typeNameIndexOrBuiltinType()));
     }
 
     // lazily resolved type
-    const QString typeName = stringAt(param.typeNameIndexOrBuiltinType);
+    const QString typeName = stringAt(param.typeNameIndexOrBuiltinType());
     if (customTypeName)
         *customTypeName = typeName;
     QQmlType qmltype;