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

Remove the alignas() from QVariant::Private

Browse Source 
This was causing miscompilations with clang on macOS. As it's
not really required, remove the alignment requirement.

Change-Id: Iacef1af7f51990daddc73fe74449adc1a823aa33
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Lars Knoll 2020-08-26 14:34:11 +02:00
parent 639c2e7f20
commit a5c71e4366
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/corelib/kernel/qvariant.cpp
View File

@ -255,7 +255,7 @@ static void customConstruct(QVariant::Private *d, const void *copy)
return; return;
} }
if (QVariant::Private::canUseInternalSpace(size)) { if (QVariant::Private::canUseInternalSpace(size, type.alignOf())) {
type.construct(&d->data, copy); type.construct(&d->data, copy);
d->is_shared = false; d->is_shared = false;
} else { } else {

7
src/corelib/kernel/qvariant.h
View File

@ -426,10 +426,11 @@ class Q_CORE_EXPORT QVariant
{ {
static constexpr size_t MaxInternalSize = 3*sizeof(void *); static constexpr size_t MaxInternalSize = 3*sizeof(void *);
template<typename T> template<typename T>
static constexpr bool CanUseInternalSpace = (sizeof(T) <= MaxInternalSize); static constexpr bool CanUseInternalSpace = (sizeof(T) <= MaxInternalSize && alignof(T) <= alignof(void *));
static constexpr bool canUseInternalSpace(size_t s) { return s <= MaxInternalSize; } static constexpr bool canUseInternalSpace(size_t s, size_t align)
{ return s <= MaxInternalSize && align <= alignof(void *); }
alignas(std::max_align_t) union union
{ {
uchar data[MaxInternalSize] = {}; uchar data[MaxInternalSize] = {};
PrivateShared *shared; PrivateShared *shared;