From 7f7d87c68da4cb29b2b2b9c324c6863228da0c26 Mon Sep 17 00:00:00 2001
From: Ulf Hermann <ulf.hermann@qt.io>
Date: Tue, 7 May 2019 12:47:33 +0200
Subject: 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>
---
 src/qml/jsruntime/qv4script_p.h | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'src/qml/jsruntime/qv4script_p.h')

diff --git a/src/qml/jsruntime/qv4script_p.h b/src/qml/jsruntime/qv4script_p.h
index a1e9b83a8b..aecedea701 100644
--- a/src/qml/jsruntime/qv4script_p.h
+++ b/src/qml/jsruntime/qv4script_p.h
@@ -80,7 +80,7 @@ struct Q_QML_EXPORT Script {
         if (qml)
             qmlContext.set(engine, *qml);
     }
-    Script(ExecutionEngine *engine, QmlContext *qml, const QQmlRefPointer<CompiledData::CompilationUnit> &compilationUnit);
+    Script(ExecutionEngine *engine, QmlContext *qml, const QQmlRefPointer<ExecutableCompilationUnit> &compilationUnit);
     ~Script();
     QString sourceFile;
     int line;
@@ -92,7 +92,7 @@ struct Q_QML_EXPORT Script {
     bool parsed;
     QV4::Compiler::ContextType contextType = QV4::Compiler::ContextType::Eval;
     QV4::PersistentValue qmlContext;
-    QQmlRefPointer<CompiledData::CompilationUnit> compilationUnit;
+    QQmlRefPointer<ExecutableCompilationUnit> compilationUnit;
     Function *vmFunction;
     bool parseAsBinding;
 
@@ -101,8 +101,10 @@ struct Q_QML_EXPORT Script {
 
     Function *function();
 
-    static QQmlRefPointer<CompiledData::CompilationUnit> precompile(QV4::Compiler::Module *module, QQmlJS::Engine *jsEngine, Compiler::JSUnitGenerator *unitGenerator,
-            const QString &fileName, const QString &finalUrl, const QString &source,
+    static QV4::CompiledData::CompilationUnit precompile(
+            QV4::Compiler::Module *module, QQmlJS::Engine *jsEngine,
+            Compiler::JSUnitGenerator *unitGenerator, const QString &fileName,
+            const QString &finalUrl, const QString &source,
             QList<QQmlError> *reportedErrors = nullptr,
             QV4::Compiler::ContextType contextType = QV4::Compiler::ContextType::Global);
     static Script *createFromFileOrCache(ExecutionEngine *engine, QmlContext *qmlContext, const QString &fileName, const QUrl &originalUrl, QString *error);
-- 
cgit v1.2.3