diff options
| author | Lars Knoll <lars.knoll@digia.com> | 2013-09-25 10:09:26 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-28 13:33:08 +0200 |
| commit | 0f2cf9074d4f0220f5c707eed478f99334814789 (patch) | |
| tree | 685ea2295b8728b3545523e2625a4cf65f39b9ee /src/qml/jsruntime/qv4vme_moth.cpp | |
| parent | 1ef957834bf9040ccd001fa6d80e483b9b21452c (diff) | |
Fix CallContext to not hold arguments on the C stack anymore
Change-Id: I35f46cce4f243d4b8b2bac9244f8fc26836f413b
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4vme_moth.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4vme_moth.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4vme_moth.cpp b/src/qml/jsruntime/qv4vme_moth.cpp index 868158717c..ce2f76042f 100644 --- a/src/qml/jsruntime/qv4vme_moth.cpp +++ b/src/qml/jsruntime/qv4vme_moth.cpp @@ -170,9 +170,9 @@ static inline QV4::Value *getValueRef(QV4::ExecutionContext *context, QV4::CallContext *cc = static_cast<QV4::CallContext *>(c); const unsigned arg = param.index; Q_ASSERT(arg >= 0); - Q_ASSERT((unsigned) arg < cc->argumentCount); - Q_ASSERT(cc->arguments); - return cc->arguments + arg; + Q_ASSERT((unsigned) arg < cc->callData->argc); + Q_ASSERT(cc->callData->args); + return cc->callData->args + arg; } else if (param.isLocal()) { VMSTATS(paramIsLocal); const unsigned index = param.index; @@ -546,7 +546,7 @@ QV4::ReturnedValue VME::run(QV4::ExecutionContext *context, const uchar *&code, MOTH_END_INSTR(Ret) MOTH_BEGIN_INSTR(LoadThis) - VALUE(instr.result) = context->thisObject; + VALUE(instr.result) = context->callData->thisObject; MOTH_END_INSTR(LoadThis) MOTH_BEGIN_INSTR(InplaceElementOp) |