summaryrefslogtreecommitdiffstats
path: root/src/corelib/tools
diff options
context:
space:
mode:
authorAndrei Golubev <andrei.golubev@qt.io>2020-08-12 11:37:06 +0200
committerAndrei Golubev <andrei.golubev@qt.io>2020-08-27 18:58:20 +0200
commit4a56a5f6cf76c7f47d15f1d3dbab3852357b22a3 (patch)
treedfabf36e014ee40cec6c03ed9de989232ae0697e /src/corelib/tools
parentf9bb3aa5ce15040cf84fa28ae42030a322dce5d1 (diff)
Support GrowsBackwards prepend in QList
Restored previously deleted logic of setting GrowsBackwards flag for prepend-like cases. This should be sufficient to fully enable prepend optimization Fixed QList::emplace to not use implementation detail logic. Updated tests to cover changed behavior and its correctness Task-number: QTBUG-84320 Change-Id: I4aadab0647fe436140b7bb5cf71309f6887e36ab Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
Diffstat (limited to 'src/corelib/tools')
-rw-r--r--src/corelib/tools/qlist.h22
1 files changed, 10 insertions, 12 deletions
diff --git a/src/corelib/tools/qlist.h b/src/corelib/tools/qlist.h
index 300baeba8c..4298434a94 100644
--- a/src/corelib/tools/qlist.h
+++ b/src/corelib/tools/qlist.h
@@ -616,6 +616,8 @@ QList<T>::insert(qsizetype i, qsizetype n, parameter_type t)
const bool shouldGrow = d->shouldGrowBeforeInsert(d.begin() + i, n);
if (d->needsDetach() || newSize > d->allocatedCapacity() || shouldGrow) {
typename Data::ArrayOptions flags = d->detachFlags() | Data::GrowsForward;
+ if (size_t(i) <= newSize / 4)
+ flags |= Data::GrowsBackwards;
DataPointer detached(DataPointer::allocateGrow(d, d->detachCapacity(newSize), newSize,
flags));
@@ -647,25 +649,21 @@ QList<T>::emplace(qsizetype i, Args&&... args)
const size_t newSize = size() + 1;
if (d->needsDetach() || newSize > d->allocatedCapacity() || shouldGrow) {
typename Data::ArrayOptions flags = d->detachFlags() | Data::GrowsForward;
+ if (size_t(i) <= newSize / 4)
+ flags |= Data::GrowsBackwards;
DataPointer detached(DataPointer::allocateGrow(d, d->detachCapacity(newSize), newSize,
flags));
const_iterator where = constBegin() + i;
+ // Create an element here to handle cases when a user moves the element
+ // from a container to the same container. This is a critical step for
+ // COW types (e.g. Qt types) since copyAppend() done before emplace()
+ // would shallow-copy the passed element and ruin the move
+ T tmp(std::forward<Args>(args)...);
- // First, create an element to handle cases, when a user moves
- // the element from a container to the same container
- detached->createInPlace(detached.begin() + i, std::forward<Args>(args)...);
-
- // Then, put the first part of the elements to the new location
detached->copyAppend(constBegin(), where);
-
- // After that, increase the actual size, because we created
- // one extra element
- ++detached.size;
-
- // Finally, put the rest of the elements to the new location
+ detached->emplace(detached.end(), std::move(tmp));
detached->copyAppend(where, constEnd());
-
d.swap(detached);
} else {
d->emplace(d.begin() + i, std::forward<Args>(args)...);