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

Inline the QPropertyBindingPrivatePtr destructor

Browse Source 
In many cases, it only derefs and does nothing else. Inline the fast
code path.

Pick-to: dev 6.0.0
Change-Id: Ib605c385c1683f7833f7189c84d6cf4eb5b0e59e
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>
This commit is contained in:
Lars Knoll 2020-11-25 12:58:11 +01:00
parent 2721728c90
commit eda4c29eb2
2 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/corelib/kernel/qproperty.cpp
View File

@ -47,10 +47,9 @@ QT_BEGIN_NAMESPACE
using namespace QtPrivate;
QPropertyBindingPrivatePtr::~QPropertyBindingPrivatePtr()
void QPropertyBindingPrivatePtr::destroyAndFreeMemory()
{
if (d && (--d->ref == 0))
QPropertyBindingPrivate::destroyAndFreeMemory(static_cast<QPropertyBindingPrivate *>(d));
QPropertyBindingPrivate::destroyAndFreeMemory(static_cast<QPropertyBindingPrivate *>(d));
}
void QPropertyBindingPrivatePtr::reset(QtPrivate::RefCounted *ptr) noexcept

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

@ -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