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>

1 files changed, 5 insertions, 2 deletions

diff --git a/src/qml/compiler/qv4compileddata_p.h b/src/qml/compiler/qv4compileddata_p.h
index 5103c6901e..31e83e8f76 100644
--- a/src/qml/compiler/qv4compileddata_p.h
+++ b/src/qml/compiler/qv4compileddata_p.h
@@ -982,7 +982,6 @@ struct Q_QML_PRIVATE_EXPORT CompilationUnitBase
     QV4::Heap::String **runtimeStrings = nullptr; // Array
     const Value* constants = nullptr;
     QV4::Value *runtimeRegularExpressions = nullptr;
-    const Unit *data = nullptr;
     QV4::Heap::InternalClass **runtimeClasses = nullptr;
 };
 
@@ -993,6 +992,7 @@ Q_STATIC_ASSERT(offsetof(CompilationUnitBase, runtimeRegularExpressions) == offs
 
 struct Q_QML_PRIVATE_EXPORT CompilationUnit final : public CompilationUnitBase
 {
+    const Unit *data = nullptr;
 public:
     CompilationUnit(const Unit *unitData = nullptr);
 #ifdef V4_BOOTSTRAP
@@ -1019,7 +1019,10 @@ public:
     }
 
     // Called only when building QML, when we build the header for JS first and append QML data
-    QV4::CompiledData::Unit *createUnitData(QmlIR::Document *irDocument);
+    Unit *createUnitData(QmlIR::Document *irDocument);
+
+    const Unit *unitData() const { return data; }
+    void setUnitData(const Unit *unitData);
 
 #ifndef V4_BOOTSTRAP
     QIntrusiveListNode nextCompilationUnit;