QVariant: Move some inline methods into a private header
We want to be able to use those from qtdeclarative. Clearly, they are intended to be inline. Task-number: QTBUG-108789 Change-Id: I3560e9b58213c4f41dbf6553021f3d6187960e8b Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io> Reviewed-by: Thiago Macieira <thiago.macieira@intel.com>
This commit is contained in:
parent
0fe6f818d2
commit
3ad9f94ff2
@ -181,7 +181,7 @@ qt_internal_add_module(Core
|
|||||||
kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
|
kernel/qtestsupport_core.cpp kernel/qtestsupport_core.h
|
||||||
kernel/qtimer.cpp kernel/qtimer.h kernel/qtimer_p.h
|
kernel/qtimer.cpp kernel/qtimer.h kernel/qtimer_p.h
|
||||||
kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
|
kernel/qtranslator.cpp kernel/qtranslator.h kernel/qtranslator_p.h
|
||||||
kernel/qvariant.cpp kernel/qvariant.h
|
kernel/qvariant.cpp kernel/qvariant.h kernel/qvariant_p.h
|
||||||
kernel/qvariantmap.h kernel/qvarianthash.h kernel/qvariantlist.h
|
kernel/qvariantmap.h kernel/qvarianthash.h kernel/qvariantlist.h
|
||||||
plugin/qfactoryinterface.cpp plugin/qfactoryinterface.h
|
plugin/qfactoryinterface.cpp plugin/qfactoryinterface.h
|
||||||
plugin/qfactoryloader.cpp plugin/qfactoryloader_p.h
|
plugin/qfactoryloader.cpp plugin/qfactoryloader_p.h
|
||||||
|
@ -3,7 +3,7 @@
|
|||||||
// Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com>
|
// Copyright (C) 2015 Olivier Goffart <ogoffart@woboq.com>
|
||||||
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||||
|
|
||||||
#include "qvariant.h"
|
#include "qvariant_p.h"
|
||||||
#include "qbitarray.h"
|
#include "qbitarray.h"
|
||||||
#include "qbytearray.h"
|
#include "qbytearray.h"
|
||||||
#include "qdatastream.h"
|
#include "qdatastream.h"
|
||||||
@ -231,21 +231,6 @@ static bool isValidMetaTypeForVariant(const QtPrivate::QMetaTypeInterface *iface
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
template <typename F> static QVariant::PrivateShared *
|
|
||||||
customConstructShared(size_t size, size_t align, F &&construct)
|
|
||||||
{
|
|
||||||
struct Deleter {
|
|
||||||
void operator()(QVariant::PrivateShared *p) const
|
|
||||||
{ QVariant::PrivateShared::free(p); }
|
|
||||||
};
|
|
||||||
|
|
||||||
// this is exception-safe
|
|
||||||
std::unique_ptr<QVariant::PrivateShared, Deleter> ptr;
|
|
||||||
ptr.reset(QVariant::PrivateShared::create(size, align));
|
|
||||||
construct(ptr->data());
|
|
||||||
return ptr.release();
|
|
||||||
}
|
|
||||||
|
|
||||||
// the type of d has already been set, but other field are not set
|
// the type of d has already been set, but other field are not set
|
||||||
static void customConstruct(const QtPrivate::QMetaTypeInterface *iface, QVariant::Private *d,
|
static void customConstruct(const QtPrivate::QMetaTypeInterface *iface, QVariant::Private *d,
|
||||||
const void *copy)
|
const void *copy)
|
||||||
@ -306,59 +291,6 @@ static QVariant::Private clonePrivate(const QVariant::Private &other)
|
|||||||
|
|
||||||
} // anonymous used to hide QVariant handlers
|
} // anonymous used to hide QVariant handlers
|
||||||
|
|
||||||
inline QVariant::PrivateShared *QVariant::PrivateShared::create(size_t size, size_t align)
|
|
||||||
{
|
|
||||||
size += sizeof(PrivateShared);
|
|
||||||
if (align > sizeof(PrivateShared)) {
|
|
||||||
// The alignment is larger than the alignment we can guarantee for the pointer
|
|
||||||
// directly following PrivateShared, so we need to allocate some additional
|
|
||||||
// memory to be able to fit the object into the available memory with suitable
|
|
||||||
// alignment.
|
|
||||||
size += align - sizeof(PrivateShared);
|
|
||||||
}
|
|
||||||
void *data = operator new(size);
|
|
||||||
auto *ps = new (data) QVariant::PrivateShared();
|
|
||||||
ps->offset = int(((quintptr(ps) + sizeof(PrivateShared) + align - 1) & ~(align - 1)) - quintptr(ps));
|
|
||||||
return ps;
|
|
||||||
}
|
|
||||||
|
|
||||||
inline void QVariant::PrivateShared::free(PrivateShared *p)
|
|
||||||
{
|
|
||||||
p->~PrivateShared();
|
|
||||||
operator delete(p);
|
|
||||||
}
|
|
||||||
|
|
||||||
inline QVariant::Private::Private(const QtPrivate::QMetaTypeInterface *iface) noexcept
|
|
||||||
: is_shared(false), is_null(false), packedType(quintptr(iface) >> 2)
|
|
||||||
{
|
|
||||||
Q_ASSERT((quintptr(iface) & 0x3) == 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
template <typename T> inline
|
|
||||||
QVariant::Private::Private(std::piecewise_construct_t, const T &t)
|
|
||||||
: is_shared(!CanUseInternalSpace<T>), is_null(std::is_same_v<T, std::nullptr_t>)
|
|
||||||
{
|
|
||||||
// confirm noexceptness
|
|
||||||
static constexpr bool isNothrowQVariantConstructible = noexcept(QVariant(t));
|
|
||||||
static constexpr bool isNothrowCopyConstructible = std::is_nothrow_copy_constructible_v<T>;
|
|
||||||
static constexpr bool isNothrowCopyAssignable = std::is_nothrow_copy_assignable_v<T>;
|
|
||||||
|
|
||||||
const QtPrivate::QMetaTypeInterface *iface = QtPrivate::qMetaTypeInterfaceForType<T>();
|
|
||||||
Q_ASSERT((quintptr(iface) & 0x3) == 0);
|
|
||||||
packedType = quintptr(iface) >> 2;
|
|
||||||
|
|
||||||
if constexpr (CanUseInternalSpace<T>) {
|
|
||||||
static_assert(isNothrowQVariantConstructible == isNothrowCopyConstructible);
|
|
||||||
static_assert(isNothrowQVariantConstructible == isNothrowCopyAssignable);
|
|
||||||
new (data.data) T(t);
|
|
||||||
} else {
|
|
||||||
static_assert(!isNothrowQVariantConstructible); // we allocate memory, even if T doesn't
|
|
||||||
data.shared = customConstructShared(sizeof(T), alignof(T), [=](void *where) {
|
|
||||||
new (where) T(t);
|
|
||||||
});
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
\class QVariant
|
\class QVariant
|
||||||
\inmodule QtCore
|
\inmodule QtCore
|
||||||
|
92
src/corelib/kernel/qvariant_p.h
Normal file
92
src/corelib/kernel/qvariant_p.h
Normal file
@ -0,0 +1,92 @@
|
|||||||
|
// Copyright (C) 2023 The Qt Company Ltd.
|
||||||
|
// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only
|
||||||
|
|
||||||
|
#ifndef QVARIANT_P_H
|
||||||
|
#define QVARIANT_P_H
|
||||||
|
|
||||||
|
//
|
||||||
|
// W A R N I N G
|
||||||
|
// -------------
|
||||||
|
//
|
||||||
|
// This file is not part of the Qt API. It exists purely as an
|
||||||
|
// implementation detail. This header file may change from version to
|
||||||
|
// version without notice, or even be removed.
|
||||||
|
//
|
||||||
|
// We mean it.
|
||||||
|
//
|
||||||
|
|
||||||
|
#include "qvariant.h"
|
||||||
|
|
||||||
|
QT_BEGIN_NAMESPACE
|
||||||
|
|
||||||
|
template <typename F> static QVariant::PrivateShared *
|
||||||
|
customConstructShared(size_t size, size_t align, F &&construct)
|
||||||
|
{
|
||||||
|
struct Deleter {
|
||||||
|
void operator()(QVariant::PrivateShared *p) const
|
||||||
|
{ QVariant::PrivateShared::free(p); }
|
||||||
|
};
|
||||||
|
|
||||||
|
// this is exception-safe
|
||||||
|
std::unique_ptr<QVariant::PrivateShared, Deleter> ptr;
|
||||||
|
ptr.reset(QVariant::PrivateShared::create(size, align));
|
||||||
|
construct(ptr->data());
|
||||||
|
return ptr.release();
|
||||||
|
}
|
||||||
|
|
||||||
|
inline QVariant::PrivateShared *QVariant::PrivateShared::create(size_t size, size_t align)
|
||||||
|
{
|
||||||
|
size += sizeof(PrivateShared);
|
||||||
|
if (align > sizeof(PrivateShared)) {
|
||||||
|
// The alignment is larger than the alignment we can guarantee for the pointer
|
||||||
|
// directly following PrivateShared, so we need to allocate some additional
|
||||||
|
// memory to be able to fit the object into the available memory with suitable
|
||||||
|
// alignment.
|
||||||
|
size += align - sizeof(PrivateShared);
|
||||||
|
}
|
||||||
|
void *data = operator new(size);
|
||||||
|
auto *ps = new (data) QVariant::PrivateShared();
|
||||||
|
ps->offset = int(((quintptr(ps) + sizeof(PrivateShared) + align - 1) & ~(align - 1)) - quintptr(ps));
|
||||||
|
return ps;
|
||||||
|
}
|
||||||
|
|
||||||
|
inline void QVariant::PrivateShared::free(PrivateShared *p)
|
||||||
|
{
|
||||||
|
p->~PrivateShared();
|
||||||
|
operator delete(p);
|
||||||
|
}
|
||||||
|
|
||||||
|
inline QVariant::Private::Private(const QtPrivate::QMetaTypeInterface *iface) noexcept
|
||||||
|
: is_shared(false), is_null(false), packedType(quintptr(iface) >> 2)
|
||||||
|
{
|
||||||
|
Q_ASSERT((quintptr(iface) & 0x3) == 0);
|
||||||
|
}
|
||||||
|
|
||||||
|
template <typename T> inline
|
||||||
|
QVariant::Private::Private(std::piecewise_construct_t, const T &t)
|
||||||
|
: is_shared(!CanUseInternalSpace<T>), is_null(std::is_same_v<T, std::nullptr_t>)
|
||||||
|
{
|
||||||
|
// confirm noexceptness
|
||||||
|
static constexpr bool isNothrowQVariantConstructible = noexcept(QVariant(t));
|
||||||
|
static constexpr bool isNothrowCopyConstructible = std::is_nothrow_copy_constructible_v<T>;
|
||||||
|
static constexpr bool isNothrowCopyAssignable = std::is_nothrow_copy_assignable_v<T>;
|
||||||
|
|
||||||
|
const QtPrivate::QMetaTypeInterface *iface = QtPrivate::qMetaTypeInterfaceForType<T>();
|
||||||
|
Q_ASSERT((quintptr(iface) & 0x3) == 0);
|
||||||
|
packedType = quintptr(iface) >> 2;
|
||||||
|
|
||||||
|
if constexpr (CanUseInternalSpace<T>) {
|
||||||
|
static_assert(isNothrowQVariantConstructible == isNothrowCopyConstructible);
|
||||||
|
static_assert(isNothrowQVariantConstructible == isNothrowCopyAssignable);
|
||||||
|
new (data.data) T(t);
|
||||||
|
} else {
|
||||||
|
static_assert(!isNothrowQVariantConstructible); // we allocate memory, even if T doesn't
|
||||||
|
data.shared = customConstructShared(sizeof(T), alignof(T), [=](void *where) {
|
||||||
|
new (where) T(t);
|
||||||
|
});
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
QT_END_NAMESPACE
|
||||||
|
|
||||||
|
#endif // QVARIANT_P_H
|
Loading…
x
Reference in New Issue
Block a user