1 files changed, 21 insertions, 4 deletions
diff --git a/src/corelib/kernel/qvariant_p.h b/src/corelib/kernel/qvariant_p.h
index f5f4d0fb8a..d2a7390938 100644
--- a/src/corelib/kernel/qvariant_p.h
+++ b/src/corelib/kernel/qvariant_p.h
@@ -19,8 +19,7 @@
 
 QT_BEGIN_NAMESPACE
 
-template <typename F> static QVariant::PrivateShared *
-customConstructShared(size_t size, size_t align, F &&construct)
+inline auto customConstructSharedImpl(size_t size, size_t align)
 {
     struct Deleter {
         void operator()(QVariant::PrivateShared *p) const
@@ -30,11 +29,23 @@ customConstructShared(size_t size, size_t align, F &&construct)
     // this is exception-safe
     std::unique_ptr<QVariant::PrivateShared, Deleter> ptr;
     ptr.reset(QVariant::PrivateShared::create(size, align));
+    return ptr;
+}
+
+template <typename F> static QVariant::PrivateShared *
+customConstructShared(size_t size, size_t align, F &&construct)
+{
+    auto ptr = customConstructSharedImpl(size, align);
     construct(ptr->data());
     return ptr.release();
 }
 
-inline QVariant::PrivateShared *QVariant::PrivateShared::create(size_t size, size_t align)
+inline int QVariant::PrivateShared::computeOffset(PrivateShared *ps, size_t align)
+{
+    return int(((quintptr(ps) + sizeof(PrivateShared) + align - 1) & ~(align - 1)) - quintptr(ps));
+}
+
+inline size_t QVariant::PrivateShared::computeAllocationSize(size_t size, size_t align)
 {
     size += sizeof(PrivateShared);
     if (align > sizeof(PrivateShared)) {
@@ -44,9 +55,15 @@ inline QVariant::PrivateShared *QVariant::PrivateShared::create(size_t size, siz
         // alignment.
         size += align - sizeof(PrivateShared);
     }
+    return size;
+}
+
+inline QVariant::PrivateShared *QVariant::PrivateShared::create(size_t size, size_t align)
+{
+    size = computeAllocationSize(size, align);
     void *data = operator new(size);
     auto *ps = new (data) QVariant::PrivateShared();
-    ps->offset = int(((quintptr(ps) + sizeof(PrivateShared) + align - 1) & ~(align - 1)) - quintptr(ps));
+    ps->offset = computeOffset(ps, align);
     return ps;
 }