aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4function_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-08 10:56:34 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:19:18 +0000
commit5bc4f4d958a3b76f3435d61206ca0109f07aa1a3 (patch)
treecb2ef4772f2d343e9957271161ac32809bc5d0a6 /src/qml/jsruntime/qv4function_p.h
parent30e3664bf3668bda9a211fe7d1404f8f806dbf7b (diff)
Refactor context handling
Fix the push/pop context instructions to not modify the JS stack anymore, as that can cause conflicts with the VME (and was an ugly hack in any case). Instead, these instructions not return the old context, that is then stored in a temporary. Get rid of Engine::current and Engine::currentContext. The StackFrame structures do now contain the only and authoritive data. This finally gives us a nice setup where we create and destroy frames on the stack when entering/leaving functions. Change-Id: If161e3e941f59865c47ecfe1e094faf62b52bfa0 Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4function_p.h')
-rw-r--r--src/qml/jsruntime/qv4function_p.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index a6b2c0c5d0..0976d22550 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -63,7 +63,7 @@ struct Q_QML_EXPORT Function {
const CompiledData::Function *compiledFunction;
CompiledData::CompilationUnit *compilationUnit;
- typedef ReturnedValue (*Code)(Function *, const FunctionObject *);
+ typedef ReturnedValue (*Code)(Heap::ExecutionContext *c, Function *, const FunctionObject *);
Code code;
const uchar *codeData;