diff options
| author | Lars Knoll <lars.knoll@qt.io> | 2017-08-30 14:25:39 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@qt.io> | 2017-09-01 12:30:27 +0000 |
| commit | 85fe2814a1397a17804d8eace4a70e5b7df854b6 (patch) | |
| tree | eecaf550665c886e2b1a2f3add6e91f2ba01297d /src/qml/jsruntime/qv4context.cpp | |
| parent | ede52ec76ed0939ce41bb81843dc750241c6e78f (diff) | |
Get rid of the FunctionObject parameter to VME::exec()
Change-Id: I5b833d1f76899a5b8fceb0f4fc109b77b1b431fc
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4context.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4context.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/qml/jsruntime/qv4context.cpp b/src/qml/jsruntime/qv4context.cpp index eaf54282e7..d672df40e8 100644 --- a/src/qml/jsruntime/qv4context.cpp +++ b/src/qml/jsruntime/qv4context.cpp @@ -55,7 +55,7 @@ DEFINE_MANAGED_VTABLE(ExecutionContext); DEFINE_MANAGED_VTABLE(CallContext); DEFINE_MANAGED_VTABLE(CatchContext); -Heap::CallContext *ExecutionContext::newCallContext(Heap::ExecutionContext *outer, Function *function, CallData *callData, const FunctionObject *f) +Heap::CallContext *ExecutionContext::newCallContext(Heap::ExecutionContext *outer, Function *function, CallData *callData) { uint nFormals = qMax(static_cast<uint>(callData->argc), function->nFormals); uint localsAndFormals = function->compiledFunction->nLocals + nFormals; @@ -68,8 +68,7 @@ Heap::CallContext *ExecutionContext::newCallContext(Heap::ExecutionContext *oute c->v4Function = function; c->outer.set(v4, outer); - if (f) - c->function.set(v4, f->d()); + c->function.set(v4, static_cast<Heap::FunctionObject *>(callData->function.m())); const CompiledData::Function *compiledFunction = function->compiledFunction; uint nLocals = compiledFunction->nLocals; |