aboutsummaryrefslogtreecommitdiffstats
path: root/src/qml/jsruntime/qv4function_p.h
diff options
context:
space:
mode:
authorLars Knoll <lars.knoll@qt.io>2017-08-07 08:10:15 +0200
committerLars Knoll <lars.knoll@qt.io>2017-08-10 08:18:05 +0000
commitfd221cf6e056b7239fc2fa2faeccd9ddeb542199 (patch)
treea453f21ac01aa01a16a7a4f378ec2ed60e07512f /src/qml/jsruntime/qv4function_p.h
parent01c338023a3a604bb24c2efb18d48f9bac33e6bc (diff)
Introduce a JS stack frame that corresponds to the C++ stack frame
The frame currently contains the function itself and the current context. Change-Id: I7d3402627fbc90e860a7bdc277585f365f5b4cb5 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.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4function_p.h b/src/qml/jsruntime/qv4function_p.h
index 9fc51e90af..17311ca3c1 100644
--- a/src/qml/jsruntime/qv4function_p.h
+++ b/src/qml/jsruntime/qv4function_p.h
@@ -63,7 +63,8 @@ struct Q_QML_EXPORT Function {
const CompiledData::Function *compiledFunction;
CompiledData::CompilationUnit *compilationUnit;
- ReturnedValue (*code)(Function *);
+ typedef ReturnedValue (*Code)(Function *, const FunctionObject *);
+ Code code;
const uchar *codeData;
// first nArguments names in internalClass are the actual arguments
@@ -72,8 +73,7 @@ struct Q_QML_EXPORT Function {
bool hasQmlDependencies;
bool canUseSimpleCall;
- Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function,
- ReturnedValue (*codePtr)(Function *));
+ Function(ExecutionEngine *engine, CompiledData::CompilationUnit *unit, const CompiledData::Function *function, Code codePtr);
~Function();
// used when dynamically assigning signal handlers (QQmlConnection)