From 52599c3cca35be20b53d0de6604743061c3e1c8c Mon Sep 17 00:00:00 2001
From: Erik Verbruggen <erik.verbruggen@qt.io>
Date: Fri, 14 Oct 2016 12:07:47 +0200
Subject: QML: Hint LTO to never inline QQmlPropertyCache::resolve

... so the fast-path doesn't get bogged down by accidental slow-path
inlining.

Change-Id: Ifb3eadf5e96b5a61f41fb1f0d32269e43f13be57
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
---
 src/qml/qml/qqmlpropertycache_p.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/qml/qml/qqmlpropertycache_p.h b/src/qml/qml/qqmlpropertycache_p.h
index 18ae32ebf9..6281b9c05e 100644
--- a/src/qml/qml/qqmlpropertycache_p.h
+++ b/src/qml/qml/qqmlpropertycache_p.h
@@ -468,7 +468,7 @@ private:
 
     QQmlPropertyData *ensureResolved(QQmlPropertyData*) const;
 
-    void resolve(QQmlPropertyData *) const;
+    Q_NEVER_INLINE void resolve(QQmlPropertyData *) const;
     void updateRecur(const QMetaObject *);
 
     template<typename K>
@@ -677,7 +677,7 @@ bool QQmlPropertyData::operator==(const QQmlPropertyRawData &other)
 
 inline QQmlPropertyData *QQmlPropertyCache::ensureResolved(QQmlPropertyData *p) const
 {
-    if (p && p->notFullyResolved())
+    if (p && Q_UNLIKELY(p->notFullyResolved()))
         resolve(p);
 
     return p;
-- 
cgit v1.2.3