Encapsulate the unit data in CompilationUnit

This allows updating the constants table when the unit data is set /
changes and removes the tie to the engine.

Change-Id: Ice553650390589e30e18421c4e55422a55d0df89
Reviewed-by: Lars Knoll <lars.knoll@qt.io>

5 files changed, 9 insertions, 8 deletions

diff --git a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
index 60717dfafa..cba5d2588e 100644
--- a/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
+++ b/tests/auto/qml/qmlcachegen/tst_qmlcachegen.cpp
@@ -159,8 +159,9 @@ void tst_qmlcachegen::loadGeneratedFile()
     QVERIFY(componentPrivate);
     auto compilationUnit = componentPrivate->compilationUnit;
     QVERIFY(compilationUnit);
-    QVERIFY(compilationUnit->data);
-    QVERIFY(!(compilationUnit->data->flags & QV4::CompiledData::Unit::StaticData));
+    auto unitData = compilationUnit->unitData();
+    QVERIFY(unitData);
+    QVERIFY(!(unitData->flags & QV4::CompiledData::Unit::StaticData));
 }
 
 void tst_qmlcachegen::translationExpressionSupport()
diff --git a/tests/auto/qml/qqmllanguage/testtypes.cpp b/tests/auto/qml/qqmllanguage/testtypes.cpp
index d5670d906f..f9a6ee8e5a 100644
--- a/tests/auto/qml/qqmllanguage/testtypes.cpp
+++ b/tests/auto/qml/qqmllanguage/testtypes.cpp
@@ -138,7 +138,7 @@ void CustomBinding::componentComplete()
     Q_ASSERT(m_target);
 
     foreach (const QV4::CompiledData::Binding *binding, bindings) {
-        QString name = compilationUnit->data->stringAt(binding->propertyNameIndex);
+        QString name = compilationUnit->stringAt(binding->propertyNameIndex);
 
         int bindingId = binding->value.compiledScriptIndex;
 
diff --git a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
index f3569c2efe..1773164e69 100644
--- a/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
+++ b/tests/auto/qml/qqmllanguage/tst_qqmllanguage.cpp
@@ -2200,12 +2200,12 @@ void tst_qqmllanguage::scriptStringWithoutSourceCode()
         QQmlRefPointer<QQmlTypeData> td = eng->typeLoader.getType(url);
         Q_ASSERT(td);
 
-        const QV4::CompiledData::Unit *readOnlyQmlUnit = td->compilationUnit()->data;
+        const QV4::CompiledData::Unit *readOnlyQmlUnit = td->compilationUnit()->unitData();
         Q_ASSERT(readOnlyQmlUnit);
         QV4::CompiledData::Unit *qmlUnit = reinterpret_cast<QV4::CompiledData::Unit *>(malloc(readOnlyQmlUnit->unitSize));
         memcpy(qmlUnit, readOnlyQmlUnit, readOnlyQmlUnit->unitSize);
         qmlUnit->flags &= ~QV4::CompiledData::Unit::StaticData;
-        td->compilationUnit()->data = qmlUnit;
+        td->compilationUnit()->setUnitData(qmlUnit);
 
         const QV4::CompiledData::Object *rootObject = qmlUnit->objectAt(/*root object*/0);
         QCOMPARE(qmlUnit->stringAt(rootObject->inheritedTypeNameIndex), QString("MyTypeObject"));
diff --git a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
index 5042a236d4..ace60d6c1f 100644
--- a/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
+++ b/tests/auto/qml/qqmltranslation/tst_qqmltranslation.cpp
@@ -85,7 +85,7 @@ void tst_qqmltranslation::translation()
                              << QStringLiteral("disambiguation")
                              << QStringLiteral("singular") << QStringLiteral("plural");
 
-        const QV4::CompiledData::Unit *unit = compilationUnit->data;
+        const QV4::CompiledData::Unit *unit = compilationUnit->unitData();
         const QV4::CompiledData::Object *rootObject = unit->objectAt(/*root object*/0);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
@@ -140,7 +140,7 @@ void tst_qqmltranslation::idTranslation()
         QV4::CompiledData::CompilationUnit *compilationUnit = typeData->compilationUnit();
         QVERIFY(compilationUnit);
 
-        const QV4::CompiledData::Unit *unit = compilationUnit->data;
+        const QV4::CompiledData::Unit *unit = compilationUnit->unitData();
         const QV4::CompiledData::Object *rootObject = unit->objectAt(/*root object*/0);
         const QV4::CompiledData::Binding *binding = rootObject->bindingTable();
         for (quint32 i = 0; i < rootObject->nBindings; ++i, ++binding) {
diff --git a/tests/auto/toolsupport/tst_toolsupport.cpp b/tests/auto/toolsupport/tst_toolsupport.cpp
index 6ee1db805a..cf90ab0531 100644
--- a/tests/auto/toolsupport/tst_toolsupport.cpp
+++ b/tests/auto/toolsupport/tst_toolsupport.cpp
@@ -101,7 +101,7 @@ void tst_toolsupport::offsets_data()
             = QTest::newRow("CompiledData::CompilationUnit::data")
             << pmm_to_offsetof(&QV4::CompiledData::CompilationUnit::data);
 
-        data << 12 << 24;
+        data << 16 << 32;
     }
 
     {