diff options
| author | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-07 13:56:31 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@theqtcompany.com> | 2015-08-10 07:24:32 +0000 |
| commit | 415f55d1400f6abdd3a8e3edaf5ff208ecdad216 (patch) | |
| tree | 88e75e6c2b5d3b757ac59b644f71410158201354 /src/qml/jsruntime/qv4functionobject.cpp | |
| parent | f21e8c641af6b2d10f0d7e7e0fc6a755dab3673c (diff) | |
Encapsulate and protect all accesses to the vtable of Heap objects
This is required, so we can safely access the vtable even while
we're marking objects during GC.
Change-Id: I34f56b61b4bca0d0742faf607eb5ab8b2c30685e
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
Diffstat (limited to 'src/qml/jsruntime/qv4functionobject.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4functionobject.cpp | 24 |
1 files changed, 18 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp index d8cdda477a..da01592c0d 100644 --- a/src/qml/jsruntime/qv4functionobject.cpp +++ b/src/qml/jsruntime/qv4functionobject.cpp @@ -208,12 +208,12 @@ Heap::FunctionObject *FunctionObject::createScriptFunction(ExecutionContext *sco bool FunctionObject::isBinding() const { - return d()->vtable == QQmlBindingFunction::staticVTable(); + return d()->vtable() == QQmlBindingFunction::staticVTable(); } bool FunctionObject::isBoundFunction() const { - return d()->vtable == BoundFunction::staticVTable(); + return d()->vtable() == BoundFunction::staticVTable(); } QQmlSourceLocation FunctionObject::sourceLocation() const @@ -513,7 +513,10 @@ ReturnedValue SimpleScriptFunction::construct(const Managed *that, CallData *cal ExecutionContextSaver ctxSaver(scope, v4->currentContext()); CallContext::Data ctx(v4); - ctx.vtable = CallContext::staticVTable(); +#ifndef QT_NO_DEBUG + ctx.mm_data = 0; // make sure we don't run into the assertion in setVTable when allocating a context on the stack +#endif + ctx.setVtable(CallContext::staticVTable()); ctx.strictMode = f->strictMode(); ctx.callData = callData; ctx.function = f->d(); @@ -548,7 +551,10 @@ ReturnedValue SimpleScriptFunction::call(const Managed *that, CallData *callData ExecutionContextSaver ctxSaver(scope, v4->currentContext()); CallContext::Data ctx(v4); - ctx.vtable = CallContext::staticVTable(); +#ifndef QT_NO_DEBUG + ctx.mm_data = 0; // make sure we don't run into the assertion in setVTable when allocating a context on the stack +#endif + ctx.setVtable(CallContext::staticVTable()); ctx.strictMode = f->strictMode(); ctx.callData = callData; ctx.function = f->d(); @@ -604,7 +610,10 @@ ReturnedValue BuiltinFunction::call(const Managed *that, CallData *callData) ExecutionContextSaver ctxSaver(scope, v4->currentContext()); CallContext::Data ctx(v4); - ctx.vtable = CallContext::staticVTable(); +#ifndef QT_NO_DEBUG + ctx.mm_data = 0; // make sure we don't run into the assertion in setVTable when allocating a context on the stack +#endif + ctx.setVtable(CallContext::staticVTable()); ctx.strictMode = f->scope()->strictMode; // ### needed? scope or parent context? ctx.callData = callData; Q_ASSERT(v4->currentContext() == &ctx); @@ -625,7 +634,10 @@ ReturnedValue IndexedBuiltinFunction::call(const Managed *that, CallData *callDa ExecutionContextSaver ctxSaver(scope, v4->currentContext()); CallContext::Data ctx(v4); - ctx.vtable = CallContext::staticVTable(); +#ifndef QT_NO_DEBUG + ctx.mm_data = 0; // make sure we don't run into the assertion in setVTable when allocating a context on the stack +#endif + ctx.setVtable(CallContext::staticVTable()); ctx.strictMode = f->scope()->strictMode; // ### needed? scope or parent context? ctx.callData = callData; Q_ASSERT(v4->currentContext() == &ctx); |