1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QVarLengthArray: Extract Method growBy()

Browse Source 
Separates the actual reallocation use-cases from the resizing ones
when calling reallocate_impl, in preparation for fixing QTBUG-109745.

Task-number: QTBUG-109745
Pick-to: 6.5 6.4
Change-Id: Iee0c3e56569ec7877beda8db3a645e2bbb6b4d4a
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Marc Mutz 2023-01-09 09:36:04 +01:00
parent 7c5ff43ea3
commit 26b227e128
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/corelib/tools/qvarlengtharray.h
View File

@ -180,11 +180,13 @@ public:
return qHashRange(begin(), end(), seed); return qHashRange(begin(), end(), seed);
} }
protected: protected:
void growBy(qsizetype prealloc, void *array, qsizetype increment)
{ reallocate_impl(prealloc, array, size(), (std::max)(size() * 2, increment)); }
template <typename...Args> template <typename...Args>
reference emplace_back_impl(qsizetype prealloc, void *array, Args&&...args) reference emplace_back_impl(qsizetype prealloc, void *array, Args&&...args)
{ {
if (size() == capacity()) // ie. size() != 0 if (size() == capacity()) // ie. size() != 0
reallocate_impl(prealloc, array, size(), size() << 1); growBy(prealloc, array, 1);
reference r = *new (end()) T(std::forward<Args>(args)...); reference r = *new (end()) T(std::forward<Args>(args)...);
++s; ++s;
return r; return r;
@ -701,7 +703,7 @@ Q_OUTOFLINE_TEMPLATE void QVLABase<T>::append_impl(qsizetype prealloc, void *arr
const qsizetype asize = size() + increment; const qsizetype asize = size() + increment;
if (asize >= capacity()) if (asize >= capacity())
reallocate_impl(prealloc, array, size(), qMax(size() * 2, asize)); growBy(prealloc, array, increment);
if constexpr (QTypeInfo<T>::isComplex) if constexpr (QTypeInfo<T>::isComplex)
std::uninitialized_copy_n(abuf, increment, end()); std::uninitialized_copy_n(abuf, increment, end());
@ -842,7 +844,7 @@ Q_OUTOFLINE_TEMPLATE auto QVLABase<T>::emplace_impl(qsizetype prealloc, void *ar
qsizetype offset = qsizetype(before - cbegin()); qsizetype offset = qsizetype(before - cbegin());
if (size() == capacity()) if (size() == capacity())
reallocate_impl(prealloc, array, size(), size() * 2); growBy(prealloc, array, 1);
if constexpr (!QTypeInfo<T>::isRelocatable) { if constexpr (!QTypeInfo<T>::isRelocatable) {
T *b = begin() + offset; T *b = begin() + offset;
T *i = end(); T *i = end();