whytofly
/
qt6-bb10
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove unused code 

Change-Id: I22f377c10a556fbb011ec98094d5a61ee3f63867
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
bb10
Lars Knoll 2020-11-11 13:47:29 +01:00
parent 39ca7d4bd1
commit faea8e2661
2 changed files with 0 additions and 95 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/corelib/tools/qarraydataops.h
View File

@ -146,30 +146,6 @@ struct QArrayExceptionSafetyPrimitives
(end - begin) * sizeof(T));
}
};
// Watches passed iterator. Moves the data range (defined as a start
// iterator and a length) to the new starting position at the end of object
// lifetime.
struct Mover
{
T *&destination;
const T *const source;
size_t n;
qsizetype &size;
static_assert(QTypeInfo<T>::isRelocatable, "Type must be relocatable");
Mover(T *&start, size_t length, qsizetype &sz) noexcept
: destination(start), source(start), n(length), size(sz)
{ }
~Mover() noexcept
{
if (destination != source)
::memmove(static_cast<void *>(destination), static_cast<const void *>(source),
n * sizeof(T));
size -= source > destination ? source - destination : destination - source;
}
};
};
// Tags for compile-time dispatch based on backwards vs forward growing policy

71
tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
View File

@ -86,7 +86,6 @@ private slots:
void selfEmplaceForward();
#ifndef QT_NO_EXCEPTIONS
void exceptionSafetyPrimitives_constructor();
void exceptionSafetyPrimitives_mover();
void exceptionSafetyPrimitives_displacer();
#endif
};
@ -2506,76 +2505,6 @@ void tst_QArrayData::exceptionSafetyPrimitives_constructor()
}
}
void tst_QArrayData::exceptionSafetyPrimitives_mover()
{
QVERIFY(QTypeInfo<ThrowingType>::isRelocatable);
using Prims = QtPrivate::QArrayExceptionSafetyPrimitives<ThrowingType>;
using Mover = typename Prims::Mover;
const auto testMoveLeft = [] (size_t posB, size_t posE) {
auto data = createDataPointer<ThrowingType>(20, 10);
auto reference = createDataPointer<ThrowingType>(20, 10);
ThrowingType *b = data.begin() + posB;
ThrowingType *e = data.begin() + posE;
const auto originalSize = data.size;
const auto length = std::distance(b, e);
{
Mover mover(e, static_cast<ThrowingType *>(data.end()) - e, data.size);
while (e != b)
(--e)->~ThrowingType();
}
QCOMPARE(data.size + length, originalSize);
qsizetype i = 0;
for (; i < std::distance(static_cast<ThrowingType *>(data.begin()), b); ++i)
QCOMPARE(data.data()[i], reference.data()[i]);
for (; i < data.size; ++i)
QCOMPARE(data.data()[i], reference.data()[i + length]);
};
const auto testMoveRight = [] (size_t posB, size_t posE) {
auto data = createDataPointer<ThrowingType>(20, 10);
auto reference = createDataPointer<ThrowingType>(20, 10);
ThrowingType *begin = data.begin();
ThrowingType *b = data.begin() + posB;
ThrowingType *e = data.begin() + posE;
const auto originalSize = data.size;
const auto length = std::distance(b, e);
{
Mover mover(begin, b - static_cast<ThrowingType *>(data.begin()), data.size);
while (b != e) {
++begin;
(b++)->~ThrowingType();
}
}
QCOMPARE(data.size + length, originalSize);
// restore original data size
{
for (qsizetype i = 0; i < length; ++i) {
new (static_cast<ThrowingType *>(data.begin() + i)) ThrowingType(42);
++data.size;
}
}
qsizetype i = length;
for (; i < std::distance(static_cast<ThrowingType *>(data.begin()), e); ++i)
QCOMPARE(data.data()[i], reference.data()[i - length]);
for (; i < data.size; ++i)
QCOMPARE(data.data()[i], reference.data()[i]);
};
// normal move left
RUN_TEST_FUNC(testMoveLeft, 2, 4);
// no move left
RUN_TEST_FUNC(testMoveLeft, 2, 2);
// normal move right
RUN_TEST_FUNC(testMoveRight, 3, 5);
// no move right
RUN_TEST_FUNC(testMoveRight, 4, 4);
}
void tst_QArrayData::exceptionSafetyPrimitives_displacer()
{
QVERIFY(QTypeInfo<ThrowingType>::isRelocatable);