1 files changed, 77 insertions, 13 deletions

diff --git a/tests/auto/corelib/tools/qlist/tst_qlist.cpp b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
index f52d4650d2..35d69e8433 100644
--- a/tests/auto/corelib/tools/qlist/tst_qlist.cpp
+++ b/tests/auto/corelib/tools/qlist/tst_qlist.cpp
@@ -1,15 +1,15 @@
 // Copyright (C) 2021 The Qt Company Ltd.
-// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only WITH Qt-GPL-exception-1.0
+// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR GPL-3.0-only
 
 #include <QTest>
 #include <QAtomicInt>
 #include <QThread>
 #include <QSemaphore>
-#include <private/qatomicscopedvaluerollback_p.h>
+#include <QAtomicScopedValueRollback>
 #include <qlist.h>
 
 
-#if __cplusplus >= 202002L && (!defined(_GLIBCXX_RELEASE) || _GLIBCXX_RELEASE >= 11)
+#ifdef QT_COMPILER_HAS_LWG3346
 #  if __has_include(<concepts>)
 #    include <concepts>
 #    if defined(__cpp_lib_concepts) && __cpp_lib_concepts >= 202002L
@@ -231,6 +231,7 @@ private slots:
     void appendCustom() const { append<Custom>(); }
     void appendRvalue() const;
     void appendList() const;
+    void assignEmpty() const;
     void assignInt() const { assign<int>(); }
     void assignMovable() const { assign<Movable>(); }
     void assignCustom() const { assign<Custom>(); }
@@ -321,6 +322,7 @@ private slots:
     void resizeToZero() const;
     void resizeToTheSameSize_data();
     void resizeToTheSameSize() const;
+    void resizeForOverwrite() const;
     void iterators() const;
     void constIterators() const;
     void reverseIterators() const;
@@ -560,25 +562,22 @@ void tst_QList::constructors_reserveAndInitialize() const
 {
     // default-initialise items
 
-    QList<int> myInt(5, 42);
+    const QList<int> myInt(5, 42);
     QVERIFY(myInt.capacity() == 5);
-    foreach (int meaningoflife, myInt) {
+    for (int meaningoflife : myInt)
         QCOMPARE(meaningoflife, 42);
-    }
 
-    QList<QString> myString(5, QString::fromLatin1("c++"));
+    const QList<QString> myString(5, QString::fromLatin1("c++"));
     QVERIFY(myString.capacity() == 5);
     // make sure all items are initialised ok
-    foreach (QString meaningoflife, myString) {
+    for (const QString &meaningoflife : myString)
         QCOMPARE(meaningoflife, QString::fromLatin1("c++"));
-    }
 
-    QList<Custom> myCustom(5, Custom('n'));
+    const QList<Custom> myCustom(5, Custom('n'));
     QVERIFY(myCustom.capacity() == 5);
     // make sure all items are initialised ok
-    foreach (Custom meaningoflife, myCustom) {
+    for (Custom meaningoflife : myCustom)
         QCOMPARE(meaningoflife.i, 'n');
-    }
 }
 
 template<typename T>
@@ -762,6 +761,25 @@ void tst_QList::append() const
     }
 }
 
+void tst_QList::assignEmpty() const
+{
+    // Test that the realloc branch in assign(it, it) doesn't crash.
+    using T = int;
+    QList<T> list;
+    QList<T> ref1 = list;
+    QVERIFY(list.d.needsDetach());
+    list.assign(list.begin(), list.begin());
+
+#if !defined Q_OS_QNX // QNX has problems with the empty istream_iterator
+    auto empty = std::istream_iterator<T>{};
+    list.squeeze();
+    QCOMPARE_EQ(list.capacity(), 0);
+    ref1 = list;
+    QVERIFY(list.d.needsDetach());
+    list.assign(empty, empty);
+#endif
+}
+
 template <typename T>
 void tst_QList::assign() const
 {
@@ -1090,6 +1108,7 @@ void tst_QList::appendList() const
         // Using operators
         // <<
         QList<ConstructionCounted> v6;
+        v6.reserve(4);
         v6 << (QList<ConstructionCounted>() << 1 << 2);
         v6 << (QList<ConstructionCounted>() << 3 << 4);
         QCOMPARE(v6, expectedFour);
@@ -2513,6 +2532,51 @@ void tst_QList::resizeToTheSameSize() const
     QCOMPARE(y.size(), x.size());
 }
 
+void tst_QList::resizeForOverwrite() const
+{
+    constexpr int BUILD_COUNT = 42;
+    {
+        // Smoke test
+        QList<int> l(BUILD_COUNT, Qt::Uninitialized);
+        l.resizeForOverwrite(l.size() + BUILD_COUNT);
+    }
+
+    {
+        const int beforeCounter = Movable::counter.loadRelaxed();
+        QList<Movable> l(BUILD_COUNT, Qt::Uninitialized);
+        const int after1Counter = Movable::counter.loadRelaxed();
+        QCOMPARE(after1Counter, beforeCounter + BUILD_COUNT);
+
+        l.resizeForOverwrite(l.size() + BUILD_COUNT);
+        const int after2Counter = Movable::counter.loadRelaxed();
+        QCOMPARE(after2Counter, after1Counter + BUILD_COUNT);
+    }
+
+    struct QtInitializationSupport {
+        bool wasInitialized;
+        QtInitializationSupport() : wasInitialized(true) {}
+        explicit QtInitializationSupport(Qt::Initialization) : wasInitialized(false) {}
+    };
+
+    {
+        QList<QtInitializationSupport> l(BUILD_COUNT);
+        for (const auto &elem : l)
+            QVERIFY(elem.wasInitialized);
+        l.resize(l.size() + BUILD_COUNT);
+        for (const auto &elem : l)
+            QVERIFY(elem.wasInitialized);
+    }
+
+    {
+        QList<QtInitializationSupport> l(BUILD_COUNT, Qt::Uninitialized);
+        for (const auto &elem : l)
+            QVERIFY(!elem.wasInitialized);
+        l.resizeForOverwrite(l.size() + BUILD_COUNT);
+        for (const auto &elem : l)
+            QVERIFY(!elem.wasInitialized);
+    }
+}
+
 void tst_QList::iterators() const
 {
     QList<int> v;
@@ -3762,7 +3826,7 @@ void tst_QList::stability_append() const
         std::generate(v.begin(), v.end(), [&k]() { return SimpleValue<T>::at(k++); });
         QList<T> src(1, SimpleValue<T>::at(0));
         v.append(src.begin(), src.end());
-        QVERIFY(v.size() < v.capacity());
+        QCOMPARE_LE(v.size(), v.capacity());
 
         for (int i = 0; i < v.capacity() - v.size(); ++i) {
             auto [copy, reference] = qlistCopyAndReferenceFromRange(v.begin(), v.end());