From 032105d4d27fdd5241a33268c31fc0244ddb50ea Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Wed, 25 Nov 2020 12:58:11 +0100 Subject: Inline the QPropertyBindingPrivatePtr destructor In many cases, it only derefs and does nothing else. Inline the fast code path. Change-Id: Ib605c385c1683f7833f7189c84d6cf4eb5b0e59e Reviewed-by: Fabian Kosmale (cherry picked from commit eda4c29eb26dab32e22040bdda0b9b9109b1408b) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qproperty.cpp | 5 ++--- src/corelib/kernel/qpropertyprivate.h | 7 ++++++- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/src/corelib/kernel/qproperty.cpp b/src/corelib/kernel/qproperty.cpp index b96dcf2edd..8a0b21c8f5 100644 --- a/src/corelib/kernel/qproperty.cpp +++ b/src/corelib/kernel/qproperty.cpp @@ -47,10 +47,9 @@ QT_BEGIN_NAMESPACE using namespace QtPrivate; -QPropertyBindingPrivatePtr::~QPropertyBindingPrivatePtr() +void QPropertyBindingPrivatePtr::destroyAndFreeMemory() { - if (d && (--d->ref == 0)) - QPropertyBindingPrivate::destroyAndFreeMemory(static_cast(d)); + QPropertyBindingPrivate::destroyAndFreeMemory(static_cast(d)); } void QPropertyBindingPrivatePtr::reset(QtPrivate::RefCounted *ptr) noexcept diff --git a/src/corelib/kernel/qpropertyprivate.h b/src/corelib/kernel/qpropertyprivate.h index d3ba9e38b1..a3fe2d208e 100644 --- a/src/corelib/kernel/qpropertyprivate.h +++ b/src/corelib/kernel/qpropertyprivate.h @@ -85,7 +85,12 @@ public: T *take() noexcept { T *x = d; d = nullptr; return x; } QPropertyBindingPrivatePtr() noexcept : d(nullptr) { } - Q_CORE_EXPORT ~QPropertyBindingPrivatePtr(); + ~QPropertyBindingPrivatePtr() + { + if (d && (--d->ref == 0)) + destroyAndFreeMemory(); + } + Q_CORE_EXPORT void destroyAndFreeMemory(); explicit QPropertyBindingPrivatePtr(T *data) noexcept : d(data) { if (d) d->addRef(); } QPropertyBindingPrivatePtr(const QPropertyBindingPrivatePtr &o) noexcept -- cgit v1.2.3