diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2014-11-07 05:46:20 +0100 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-11-12 12:13:03 +0100 |
| commit | 19ae8cdffeaeb3fc6716b6f0a7ee8756ec9700c7 (patch) | |
| tree | 91083b44b1f3db49c246ce74b20af83310d530f5 /src/qml/jsruntime/qv4script.cpp | |
| parent | 7e61b8c09c647229e78bdedec9421f90063466af (diff) | |
Convert ExecutionContext::parent/outer to use a heap object
Change-Id: I1b8ee831cfcdd5b1904ce24a341f5a796dce41cf
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4script.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4script.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4script.cpp b/src/qml/jsruntime/qv4script.cpp index 7f2e44eebf..e262eaa8ca 100644 --- a/src/qml/jsruntime/qv4script.cpp +++ b/src/qml/jsruntime/qv4script.cpp @@ -162,8 +162,9 @@ void QmlBindingWrapper::markObjects(Heap::Base *m, ExecutionEngine *e) static ReturnedValue signalParameterGetter(QV4::CallContext *ctx, uint parameterIndex) { - QV4::CallContext *signalEmittingContext = ctx->d()->parent->asCallContext(); - Q_ASSERT(signalEmittingContext); + QV4::Scope scope(ctx); + QV4::Scoped<CallContext> signalEmittingContext(scope, static_cast<Heap::CallContext *>(ctx->d()->parent)); + Q_ASSERT(signalEmittingContext && signalEmittingContext->d()->type >= QV4::Heap::ExecutionContext::Type_SimpleCallContext); return signalEmittingContext->argument(parameterIndex); } |