diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-08-21 17:31:22 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-02 17:27:36 +0200 |
| commit | 6f472680ebecb3a4d700eedcf62cb423b05c4fd1 (patch) | |
| tree | bc732911a9c353dbac232ebda5a94468e3e261fe /src/qml/jsruntime/qv4include.cpp | |
| parent | da2f24d8e5c32fe4ed45dcb89aa357465f85fc1e (diff) | |
change calling convention for JS function calls
This allows faster pass through of the data if we have
nested calls.
Also make sure we always reserve at least
QV4::Global::ReservedArgumentCount Values on the
stack to avoid stack corruption.
Change-Id: I42976460f1ef11a333d4adda70fba8daac66acf3
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4include.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4include.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4include.cpp b/src/qml/jsruntime/qv4include.cpp index 4fd7bb14c7..9068d573f6 100644 --- a/src/qml/jsruntime/qv4include.cpp +++ b/src/qml/jsruntime/qv4include.cpp @@ -102,10 +102,12 @@ void QV4Include::callback(const QV4::Value &callback, const QV4::Value &status) if (!f) return; - QV4::Value args[] = { status }; QV4::ExecutionContext *ctx = f->engine()->current; try { - f->call(QV4::Value::fromObject(f->engine()->globalObject), args, 1); + CALLDATA(1); + d.thisObject = QV4::Value::fromObject(f->engine()->globalObject); + d.args[0] = status; + f->call(d); } catch (QV4::Exception &e) { e.accept(ctx); } |