QtQml: Make base CU a member of ExecutableCompilationUnit

We want to re-use the base compilation unit across engines. For that to
work it cannot be a slice of the engine-specific
ExecutableCompilationUnit.

Since CompiledData::CompilationUnit is refcounted on its own now, make
it unmovable.

Change-Id: I8418c9754d7a07e5210c1e7a7fc69355e1d57807
Reviewed-by: Fabian Kosmale <[email protected]>

1 files changed, 3 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4module.cpp b/src/qml/jsruntime/qv4module.cpp
index e044d285ee..f701529096 100644
--- a/src/qml/jsruntime/qv4module.cpp
+++ b/src/qml/jsruntime/qv4module.cpp
@@ -51,8 +51,8 @@ void Heap::Module::init(ExecutionEngine *engine, ExecutableCompilationUnit *modu
     {
         Scoped<QV4::InternalClass> ic(valueScope, scope->internalClass);
 
-        for (uint i = 0; i < unit->data->importEntryTableSize; ++i) {
-            const CompiledData::ImportEntry &import = unit->data->importEntryTable()[i];
+        for (uint i = 0; i < unit->unitData()->importEntryTableSize; ++i) {
+            const CompiledData::ImportEntry &import = unit->unitData()->importEntryTable()[i];
             ic = ic->addMember(engine->identifierTable->asPropertyKey(unit->runtimeStrings[import.localName]), Attr_NotConfigurable);
         }
         scope->internalClass.set(engine, ic->d());
@@ -76,7 +76,7 @@ void Module::evaluate()
     unit->evaluateModuleRequests();
 
     ExecutionEngine *v4 = engine();
-    Function *moduleFunction = unit->runtimeFunctions[unit->data->indexOfRootFunction];
+    Function *moduleFunction = unit->runtimeFunctions[unit->unitData()->indexOfRootFunction];
     JSTypesStackFrame frame;
     frame.init(moduleFunction, nullptr, 0);
     frame.setupJSFrame(v4->jsStackTop, Value::undefinedValue(), d()->scope,