diff options
author | Lars Knoll <lars.knoll@qt.io> | 2017-01-31 14:03:51 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2017-03-09 08:58:34 +0000 |
commit | 91714e004e0c91527e7049ff43565dda682fc2bd (patch) | |
tree | bd5ff925acf6c8e1b98667c0b18028576cf94662 /src/qml/jsruntime/qv4engine.cpp | |
parent | 518e258d59adc976e2e8aa9a7f9ef36d8b8cdb66 (diff) |
Make all write operations to Pointer<> types go through a set() method
The new set() method also taked an ExecutionEngine pointer. This makes
it trivial to now add a write barrier for those operations.
Change-Id: I321eccfe6fb279cc240b5c84910e6854f71759f6
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4engine.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4engine.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4engine.cpp b/src/qml/jsruntime/qv4engine.cpp index bc618e3e7a..f38580e5f8 100644 --- a/src/qml/jsruntime/qv4engine.cpp +++ b/src/qml/jsruntime/qv4engine.cpp @@ -398,7 +398,7 @@ ExecutionEngine::ExecutionEngine(EvalISelFactory *factory) // // set up the global object // - rootContext()->d()->global = globalObject->d(); + rootContext()->d()->global.set(scope.engine, globalObject->d()); rootContext()->d()->callData->thisObject = globalObject; Q_ASSERT(globalObject->d()->vtable()); @@ -605,7 +605,7 @@ Heap::ArrayObject *ExecutionEngine::newArrayObject(const Value *values, int leng d->values.alloc = length; d->values.size = length; memcpy(&d->values.v, values, length*sizeof(Value)); - a->d()->arrayData = d; + a->d()->arrayData.set(this, d); a->setArrayLengthUnchecked(length); } return a->d(); |