diff options
| author | Liang Qi <liang.qi@qt.io> | 2018-06-25 10:16:26 +0000 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2018-06-25 10:16:26 +0000 |
| commit | 8597f74e520c18e0ac1c7a90e02a3b5ba33d4753 (patch) | |
| tree | 8ec478d8726deddb0b9891dbeecc92850c5e6999 /src/qml/jsruntime/qv4object.cpp | |
| parent | 0b0ff6e8cdb5d59983ae44a1d475eee11dd531c4 (diff) | |
| parent | fbf6f7400a5b5ae10267171e201391ce1ff8eb96 (diff) | |
Merge "Merge remote-tracking branch 'origin/5.11' into dev" into refs/staging/dev
Diffstat (limited to 'src/qml/jsruntime/qv4object.cpp')
| -rw-r--r-- | src/qml/jsruntime/qv4object.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/qml/jsruntime/qv4object.cpp b/src/qml/jsruntime/qv4object.cpp index d1f71b18ae..dff7555061 100644 --- a/src/qml/jsruntime/qv4object.cpp +++ b/src/qml/jsruntime/qv4object.cpp @@ -237,11 +237,8 @@ void Heap::Object::markObjects(Heap::Base *b, MarkStack *stack) Object *o = static_cast<Object *>(b); if (o->memberData) o->memberData->mark(stack); - if (o->arrayData) { - o->arrayData->setMarkBit(); - if (o->arrayData->needsMark) - ArrayData::markObjects(o->arrayData, stack); - } + if (o->arrayData) + o->arrayData->mark(stack); uint nInline = o->vtable()->nInlineProperties; Value *v = reinterpret_cast<Value *>(o) + o->vtable()->inlinePropertyOffset; const Value *end = v + nInline; |