diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 16:12:22 +0200 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-06-19 14:20:44 +0000 |
commit | d1693c14b4e7f7d4a8ab4b2e876d9cf43a621e2e (patch) | |
tree | 9ce0e6c8d75f2df6654a7dd03d2e7441ea9c1e85 /src/qml/jsruntime/qv4arraydata.cpp | |
parent | 27a6b122343322a02e0fe26fb76c05f6105c4b94 (diff) |
revert change 353164263c55825a0ec72d30128c50560c626334
The change was too aggressive in trying to avoid marking
the array data. We didn't catch all cases where on could be
inserting a GC controlled object into the array data. Let's
be safe and always mark the content of array data objects.
Task-number: QTBUG-68894
Change-Id: Ifbb628be898c0903596b1a483212384295b01df5
Reviewed-by: Erik Verbruggen <erik.verbruggen@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4arraydata.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4arraydata.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index b33b34ee08..855407e6f7 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -168,8 +168,6 @@ void ArrayData::realloc(Object *o, Type newType, uint requested, bool enforceAtt } newData->setAlloc(alloc); newData->setType(newType); - if (d) - newData->d()->needsMark = d->d()->needsMark; newData->setAttrs(enforceAttributes ? reinterpret_cast<PropertyAttributes *>(newData->d()->values.values + alloc) : nullptr); o->setArrayData(newData); @@ -192,8 +190,6 @@ void ArrayData::realloc(Object *o, Type newType, uint requested, bool enforceAtt memcpy(newData->d()->values.values, d->d()->values.values + offset, sizeof(Value)*toCopy); } - if (newType != Heap::ArrayData::Simple) - newData->d()->needsMark = true; if (newType != Heap::ArrayData::Sparse) return; |