summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--src/corelib/kernel/qmetaobject.cpp1
-rw-r--r--src/corelib/text/qbytearray.h8
-rw-r--r--src/corelib/text/qstring.h13
-rw-r--r--src/corelib/text/qstringliteral.h2
-rw-r--r--src/corelib/tools/qarraydata.cpp4
-rw-r--r--src/corelib/tools/qarraydata.h12
-rw-r--r--src/corelib/tools/qvector.h15
-rw-r--r--tests/auto/corelib/tools/qarraydata/simplevector.h4
-rw-r--r--tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp6
9 files changed, 23 insertions, 42 deletions
diff --git a/src/corelib/kernel/qmetaobject.cpp b/src/corelib/kernel/qmetaobject.cpp
index 4484dfdce9..b51bb616b2 100644
--- a/src/corelib/kernel/qmetaobject.cpp
+++ b/src/corelib/kernel/qmetaobject.cpp
@@ -160,7 +160,6 @@ static inline const QByteArray stringData(const QMetaObject *mo, int index)
const QByteArrayDataPtr data = { const_cast<QByteArrayData*>(&mo->d.stringdata[index]) };
Q_ASSERT(data.ptr->ref.isStatic());
Q_ASSERT(data.ptr->alloc == 0);
- Q_ASSERT(data.ptr->capacityReserved == 0);
Q_ASSERT(data.ptr->size >= 0);
return data;
}
diff --git a/src/corelib/text/qbytearray.h b/src/corelib/text/qbytearray.h
index 4d56cd93fd..2808494407 100644
--- a/src/corelib/text/qbytearray.h
+++ b/src/corelib/text/qbytearray.h
@@ -509,9 +509,7 @@ inline void QByteArray::reserve(int asize)
if (d->ref.isShared() || uint(asize) + 1u > d->alloc) {
reallocData(qMax(uint(size()), uint(asize)) + 1u, d->detachFlags() | Data::CapacityReserved);
} else {
- // cannot set unconditionally, since d could be the shared_null or
- // otherwise static
- d->capacityReserved = true;
+ d->flags |= Data::CapacityReserved;
}
}
@@ -520,9 +518,7 @@ inline void QByteArray::squeeze()
if (d->ref.isShared() || uint(d->size) + 1u < d->alloc) {
reallocData(uint(d->size) + 1u, d->detachFlags() & ~Data::CapacityReserved);
} else {
- // cannot set unconditionally, since d could be shared_null or
- // otherwise static.
- d->capacityReserved = false;
+ d->flags &= ~Data::CapacityReserved;
}
}
diff --git a/src/corelib/text/qstring.h b/src/corelib/text/qstring.h
index 4635962057..630a33c4ae 100644
--- a/src/corelib/text/qstring.h
+++ b/src/corelib/text/qstring.h
@@ -1266,10 +1266,8 @@ inline void QString::reserve(int asize)
if (d->ref.isShared() || uint(asize) >= d->alloc)
reallocData(qMax(asize, d->size) + 1u);
- if (!d->capacityReserved) {
- // cannot set unconditionally, since d could be the shared_null/shared_empty (which is const)
- d->capacityReserved = true;
- }
+ // we're not shared anymore, for sure
+ d->flags |= Data::CapacityReserved;
}
inline void QString::squeeze()
@@ -1277,11 +1275,8 @@ inline void QString::squeeze()
if (d->ref.isShared() || uint(d->size) + 1u < d->alloc)
reallocData(uint(d->size) + 1u);
- if (d->capacityReserved) {
- // cannot set unconditionally, since d could be shared_null or
- // otherwise static.
- d->capacityReserved = false;
- }
+ // we're not shared anymore, for sure
+ d->flags &= ~Data::CapacityReserved;
}
inline QString &QString::setUtf16(const ushort *autf16, int asize)
diff --git a/src/corelib/text/qstringliteral.h b/src/corelib/text/qstringliteral.h
index 2a7e607c63..b407bf6bc0 100644
--- a/src/corelib/text/qstringliteral.h
+++ b/src/corelib/text/qstringliteral.h
@@ -75,7 +75,7 @@ Q_STATIC_ASSERT_X(sizeof(qunicodechar) == 2,
/**/
#define Q_STATIC_STRING_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
- { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
+ { Q_REFCOUNT_INITIALIZE_STATIC, QArrayData::DefaultAllocationFlags, size, 0, offset } \
/**/
#define Q_STATIC_STRING_DATA_HEADER_INITIALIZER(size) \
diff --git a/src/corelib/tools/qarraydata.cpp b/src/corelib/tools/qarraydata.cpp
index 592faf39c3..ce6f138497 100644
--- a/src/corelib/tools/qarraydata.cpp
+++ b/src/corelib/tools/qarraydata.cpp
@@ -183,7 +183,7 @@ static QArrayData *reallocateData(QArrayData *header, size_t allocSize, uint opt
{
header = static_cast<QArrayData *>(::realloc(header, allocSize));
if (header)
- header->capacityReserved = bool(options & QArrayData::CapacityReserved);
+ header->flags = options;
return header;
}
@@ -219,7 +219,7 @@ QArrayData *QArrayData::allocate(size_t objectSize, size_t alignment,
header->ref.atomic.storeRelaxed(1);
header->size = 0;
header->alloc = capacity;
- header->capacityReserved = bool(options & CapacityReserved);
+ header->flags = options;
header->offset = data - quintptr(header);
}
diff --git a/src/corelib/tools/qarraydata.h b/src/corelib/tools/qarraydata.h
index c2da2767c3..9a3b53338c 100644
--- a/src/corelib/tools/qarraydata.h
+++ b/src/corelib/tools/qarraydata.h
@@ -49,9 +49,9 @@ QT_BEGIN_NAMESPACE
struct Q_CORE_EXPORT QArrayData
{
QtPrivate::RefCount ref;
+ uint flags;
int size;
- uint alloc : 31;
- uint capacityReserved : 1;
+ uint alloc;
qptrdiff offset; // in bytes from beginning of header
@@ -90,7 +90,7 @@ struct Q_CORE_EXPORT QArrayData
size_t detachCapacity(size_t newSize) const
{
- if (capacityReserved && newSize < alloc)
+ if (flags & CapacityReserved && newSize < alloc)
return alloc;
return newSize;
}
@@ -98,7 +98,7 @@ struct Q_CORE_EXPORT QArrayData
ArrayOptions detachFlags() const
{
ArrayOptions result;
- if (capacityReserved)
+ if (flags & CapacityReserved)
result |= CapacityReserved;
return result;
}
@@ -106,7 +106,7 @@ struct Q_CORE_EXPORT QArrayData
ArrayOptions cloneFlags() const
{
ArrayOptions result;
- if (capacityReserved)
+ if (flags & CapacityReserved)
result |= CapacityReserved;
return result;
}
@@ -304,7 +304,7 @@ struct QArrayDataPointerRef
};
#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER_WITH_OFFSET(size, offset) \
- { Q_REFCOUNT_INITIALIZE_STATIC, size, 0, 0, offset } \
+ { Q_REFCOUNT_INITIALIZE_STATIC, QArrayData::DefaultAllocationFlags, size, 0, offset } \
/**/
#define Q_STATIC_ARRAY_DATA_HEADER_INITIALIZER(type, size) \
diff --git a/src/corelib/tools/qvector.h b/src/corelib/tools/qvector.h
index 3220ba1463..d64673cc16 100644
--- a/src/corelib/tools/qvector.h
+++ b/src/corelib/tools/qvector.h
@@ -119,12 +119,7 @@ public:
*this = QVector<T>();
return;
}
- realloc(d->size);
- }
- if (d->capacityReserved) {
- // capacity reserved in a read only memory would be useless
- // this checks avoid writing to such memory.
- d->capacityReserved = 0;
+ realloc(d->size, QArrayData::ArrayOptions(d->flags));
}
}
@@ -376,10 +371,10 @@ inline QVector<T>::QVector(const QVector<T> &v)
if (v.d->ref.ref()) {
d = v.d;
} else {
- if (v.d->capacityReserved) {
+ if (v.d->flags & Data::CapacityReserved) {
d = Data::allocate(v.d->alloc);
Q_CHECK_PTR(d);
- d->capacityReserved = true;
+ d->flags |= Data::CapacityReserved;
} else {
d = Data::allocate(v.d->size);
Q_CHECK_PTR(d);
@@ -412,7 +407,7 @@ void QVector<T>::reserve(int asize)
if (asize > int(d->alloc))
realloc(asize);
if (isDetached())
- d->capacityReserved = 1;
+ d->flags |= Data::CapacityReserved;
Q_ASSERT(capacity() >= asize);
}
@@ -644,7 +639,6 @@ void QVector<T>::reallocData(const int asize, const int aalloc, QArrayData::Arra
Data::deallocate(x);
QT_RETHROW;
}
- x->capacityReserved = d->capacityReserved;
} else {
Q_ASSERT(int(d->alloc) == aalloc); // resize, without changing allocation size
Q_ASSERT(isDetached()); // can be done only on detached d
@@ -723,7 +717,6 @@ void QVector<T>::realloc(int aalloc, QArrayData::ArrayOptions options)
Data::deallocate(x);
QT_RETHROW;
}
- x->capacityReserved = d->capacityReserved;
Q_ASSERT(d != x);
if (!d->ref.deref()) {
diff --git a/tests/auto/corelib/tools/qarraydata/simplevector.h b/tests/auto/corelib/tools/qarraydata/simplevector.h
index ffc8ba770c..b5308e2231 100644
--- a/tests/auto/corelib/tools/qarraydata/simplevector.h
+++ b/tests/auto/corelib/tools/qarraydata/simplevector.h
@@ -139,10 +139,10 @@ public:
return;
if (n <= capacity()) {
- if (d->capacityReserved)
+ if (d->flags & Data::CapacityReserved)
return;
if (!d->ref.isShared()) {
- d->capacityReserved = 1;
+ d->flags |= Data::CapacityReserved;
return;
}
}
diff --git a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
index d3e071bb1b..1a043f7797 100644
--- a/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
+++ b/tests/auto/corelib/tools/qarraydata/tst_qarraydata.cpp
@@ -155,11 +155,9 @@ void tst_QArrayData::sharedNullEmpty()
QCOMPARE(null->size, 0);
QCOMPARE(null->alloc, 0u);
- QCOMPARE(null->capacityReserved, 0u);
QCOMPARE(empty->size, 0);
QCOMPARE(empty->alloc, 0u);
- QCOMPARE(empty->capacityReserved, 0u);
}
void tst_QArrayData::staticData()
@@ -602,7 +600,7 @@ void tst_QArrayData::allocate()
QVERIFY(data->alloc > uint(capacity));
else
QCOMPARE(data->alloc, uint(capacity));
- QCOMPARE(data->capacityReserved, uint(isCapacityReserved));
+ QCOMPARE(bool(data->flags & QArrayData::CapacityReserved), isCapacityReserved);
// Check that the allocated array can be used. Best tested with a
// memory checker, such as valgrind, running.
@@ -647,7 +645,7 @@ void tst_QArrayData::reallocate()
QVERIFY(data->alloc > uint(newCapacity));
else
QCOMPARE(data->alloc, uint(newCapacity));
- QCOMPARE(data->capacityReserved, uint(isCapacityReserved));
+ QCOMPARE(!(data->flags & QArrayData::CapacityReserved), !isCapacityReserved);
for (int i = 0; i < capacity; ++i)
QCOMPARE(static_cast<char *>(data->data())[i], 'A');
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-13 14:42:30 +0000