Split CompiledData::CompilationUnit in two

We need a CompilationUnit that only holds the data needed for
compilation and another one that is executable by the runtime.

Change-Id: I704d859ba028576a18460f5e3a59f210f64535d3
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 10 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp
index 6cb2e95cdc..ee7f4dff0b 100644
--- a/src/qml/jsruntime/qv4script.cpp
+++ b/src/qml/jsruntime/qv4script.cpp
@@ -61,7 +61,7 @@
 
 using namespace QV4;
 
-Script::Script(ExecutionEngine *v4, QmlContext *qml, const QQmlRefPointer<CompiledData::CompilationUnit> &compilationUnit)
+Script::Script(ExecutionEngine *v4, QmlContext *qml, const QQmlRefPointer<ExecutableCompilationUnit> &compilationUnit)
     : line(1), column(0), context(v4->rootContext()), strictMode(false), inheritContext(true), parsed(false)
     , compilationUnit(compilationUnit), vmFunction(nullptr), parseAsBinding(true)
 {
@@ -133,7 +133,7 @@ void Script::parse()
         if (v4->hasException)
             return;
 
-        compilationUnit = cg.generateCompilationUnit();
+        compilationUnit = QV4::ExecutableCompilationUnit::create(cg.generateCompilationUnit());
         vmFunction = compilationUnit->linkToEngine(v4);
     }
 
@@ -172,10 +172,11 @@ Function *Script::function()
     return vmFunction;
 }
 
-QQmlRefPointer<QV4::CompiledData::CompilationUnit> Script::precompile(QV4::Compiler::Module *module, QQmlJS::Engine *jsEngine, Compiler::JSUnitGenerator *unitGenerator,
-                                                                      const QString &fileName, const QString &finalUrl, const QString &source,
-                                                                      QList<QQmlError> *reportedErrors,
-                                                                      QV4::Compiler::ContextType contextType)
+QV4::CompiledData::CompilationUnit Script::precompile(
+        QV4::Compiler::Module *module, QQmlJS::Engine *jsEngine,
+        Compiler::JSUnitGenerator *unitGenerator, const QString &fileName, const QString &finalUrl,
+        const QString &source, QList<QQmlError> *reportedErrors,
+        QV4::Compiler::ContextType contextType)
 {
     using namespace QV4::Compiler;
     using namespace QQmlJS::AST;
@@ -219,8 +220,9 @@ Script *Script::createFromFileOrCache(ExecutionEngine *engine, QmlContext *qmlCo
 
     QQmlMetaType::CachedUnitLookupError cacheError = QQmlMetaType::CachedUnitLookupError::NoError;
     if (const QV4::CompiledData::Unit *cachedUnit = QQmlMetaType::findCachedCompilationUnit(originalUrl, &cacheError)) {
-        QQmlRefPointer<QV4::CompiledData::CompilationUnit> jsUnit;
-        jsUnit.adopt(new QV4::CompiledData::CompilationUnit(cachedUnit));
+        QQmlRefPointer<QV4::ExecutableCompilationUnit> jsUnit
+                = QV4::ExecutableCompilationUnit::create(
+                        QV4::CompiledData::CompilationUnit(cachedUnit));
         return new QV4::Script(engine, qmlContext, jsUnit);
     }