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

QArrayData: inline the allocateData function

Browse Source 
It is already inlined by the compiler so this is a effectively a no-op.
The aim of this change is to make later work in this file cleaner and
easier to review.

Deduplicate the if check and alloc assignment, and remove the
unnecessary qsizetype cast.

Change-Id: I139f1132779ce4c583a5be689800940801142d36
Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
Aurélien Brooke 2025-01-24 17:08:15 +01:00
parent 5229cba24f
commit ed7d59c0a2
1 changed files with 5 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/corelib/tools/qarraydata.cpp
View File

@ -134,17 +134,6 @@ calculateBlockSize(qsizetype capacity, qsizetype objectSize, qsizetype headerSiz
}
}
static QArrayData *allocateData(qsizetype allocSize)
{
QArrayData *header = static_cast<QArrayData *>(::malloc(size_t(allocSize)));
if (header) {
header->ref_.storeRelaxed(1);
header->flags = {};
header->alloc = 0;
}
return header;
}
namespace {
struct AllocationResult {
void *data;
@ -178,12 +167,14 @@ allocateHelper(qsizetype objectSize, qsizetype alignment, qsizetype capacity,
if (Q_UNLIKELY(allocSize < 0)) // handle overflow. cannot allocate reliably
return {};
QArrayData *header = allocateData(allocSize);
void *data = nullptr;
if (header) {
QArrayData *header = static_cast<QArrayData *>(::malloc(size_t(allocSize)));
if (Q_LIKELY(header)) {
header->ref_.storeRelaxed(1);
header->flags = {};
// find where offset should point to so that data() is aligned to alignment bytes
data = QTypedArrayData<void>::dataStart(header, alignment);
header->alloc = qsizetype(capacity);
header->alloc = capacity;
}
return { data, header };