From bf7b1a2aa83ce631879914cb98133e32b20f0104 Mon Sep 17 00:00:00 2001
From: Fabian Kosmale <fabian.kosmale@qt.io>
Date: Tue, 26 Jan 2021 10:11:20 +0100
Subject: QVariant: Do not destroy trivial types

perf indicates that we spend quite some time in ~QVariant in the
referenced task's benchmark. With this patch, we significantly reduce
the amount of work we do in the destructor for trivial types: Instead of
calling an out-of-line function, which does a few checks and then does
an indirect call through a function pointer to a do-nothing dtor before
freeing the memory, we now simply free the memory.

We achieve this by changing QMetaTypeInterface to leave the dtor
function pointer null if the type is trivially destructible. Then, in
QVariant we use the QMetaTypeInterface directly instead of going through
QMetaType.

Task-number: QTBUG-90560
Change-Id: Iaf87036710e1680323842e1ba703a5d3d0e5027a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/corelib/kernel/qmetatype.h  | 2 +-
 src/corelib/kernel/qvariant.cpp | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'src/corelib/kernel')

diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index cd9b6ad6c6..67bcacd751 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -2220,7 +2220,7 @@ public:
 
     static constexpr QMetaTypeInterface::DtorFn getDtor()
     {
-        if constexpr (std::is_destructible_v<S>)
+        if constexpr (std::is_destructible_v<S> && !std::is_trivially_destructible_v<S>)
             return [](const QMetaTypeInterface *, void *addr) {
                 reinterpret_cast<S *>(addr)->~S();
             };
diff --git a/src/corelib/kernel/qvariant.cpp b/src/corelib/kernel/qvariant.cpp
index c2ae5fb1dc..036ee42e05 100644
--- a/src/corelib/kernel/qvariant.cpp
+++ b/src/corelib/kernel/qvariant.cpp
@@ -270,10 +270,15 @@ static void customConstruct(QVariant::Private *d, const void *copy)
 
 static void customClear(QVariant::Private *d)
 {
+    auto iface = reinterpret_cast<QtPrivate::QMetaTypeInterface *>(d->packedType << 2);
+    if (!iface)
+        return;
     if (!d->is_shared) {
-        d->type().destruct(&d->data);
+        if (iface->dtor)
+            iface->dtor(iface, &d->data);
     } else {
-        d->type().destruct(d->data.shared->data());
+        if (iface->dtor)
+            iface->dtor(iface, d->data.shared->data());
         QVariant::PrivateShared::free(d->data.shared);
     }
 }
-- 
cgit v1.2.3