Pass a more comprehensive context to AOT-compiled functions

We need the compilation unit, and a way to retrieve JavaScript metatypes
from it. Also, prepare for cases where we only have a QJSEngine, not a
QQmlEngine, and pass the scope object as part of the AOT context.

Change-Id: Ica81e92c99f3c9b6baffd04db1e0e91603fd2ac7
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 6 insertions, 3 deletions

diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp
index 9fefa2a38c..bea301c6e3 100644
--- a/src/qml/jsruntime/qv4vme_moth.cpp
+++ b/src/qml/jsruntime/qv4vme_moth.cpp
@@ -489,9 +489,12 @@ ReturnedValue VME::exec(CppStackFrame *frame, ExecutionEngine *engine)
 
         Scope scope(engine);
         Scoped<QmlContext> qmlContext(scope, engine->qmlContext());
-        function->aotFunction->functionPtr(
-                qmlContext->qmlContext()->asQQmlContext(), qmlContext->qmlScope(),
-                returnValue, argumentPtrs);
+        QQmlPrivate::AOTCompiledContext aotContext;
+        aotContext.qmlContext = qmlContext ? qmlContext->qmlContext()->asQQmlContext() : nullptr;
+        aotContext.qmlScopeObject = qmlContext ? qmlContext->qmlScope() : nullptr;
+        aotContext.engine = engine->jsEngine();
+        aotContext.compilationUnit = function->executableCompilationUnit();
+        function->aotFunction->functionPtr(&aotContext, returnValue, argumentPtrs);
 
         if (returnValue) {
             result = engine->metaTypeToJS(returnType.id(), returnValue);