From 878b11e0a94e892c0377bca01b49706c150926ed Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 1 Nov 2014 20:56:47 +0100 Subject: Let markObjects() operate directly on HeapObjects This decouples things a bit better and helps moving over to directly store heapobject pointers in other objects. Change-Id: I798f922e018b0a3ca6f8768e4a810187f34d82f6 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4arraydata.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/qml/jsruntime/qv4arraydata.cpp') diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index 12bffef04e..5aaed1a98d 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -213,12 +213,12 @@ void ArrayData::ensureAttributes(Object *o) } -void SimpleArrayData::markObjects(Managed *d, ExecutionEngine *e) +void SimpleArrayData::markObjects(HeapObject *d, ExecutionEngine *e) { - SimpleArrayData *dd = static_cast(d); - uint l = dd->len(); + SimpleArrayData::Data *dd = static_cast(d); + uint l = dd->len; for (uint i = 0; i < l; ++i) - dd->data(i).mark(e); + dd->arrayData[i].mark(e); } ReturnedValue SimpleArrayData::get(const ArrayData *d, uint index) @@ -363,12 +363,12 @@ void SparseArrayData::destroy(Managed *d) delete dd->sparse(); } -void SparseArrayData::markObjects(Managed *d, ExecutionEngine *e) +void SparseArrayData::markObjects(HeapObject *d, ExecutionEngine *e) { - SparseArrayData *dd = static_cast(d); - uint l = dd->alloc(); + SparseArrayData::Data *dd = static_cast(d); + uint l = dd->alloc; for (uint i = 0; i < l; ++i) - dd->arrayData()[i].mark(e); + dd->arrayData[i].mark(e); } ArrayData *SparseArrayData::reallocate(Object *o, uint n, bool enforceAttributes) -- cgit v1.2.3