QML: allow QObjectWrapper::init to be inlined

And also hint that wrap_slowPath should not be inlined with LTO,
otherwise the fast-path wrap method will lose any advantage it has.

Change-Id: I30d52fa2f64b813aaeb5c0d62f6d48ec1ba03fa1
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 7 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index d66b5364be..d91965a350 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -195,12 +195,6 @@ static QV4::ReturnedValue loadProperty(QV4::ExecutionEngine *v4, QObject *object
     }
 }
 
-void Heap::QObjectWrapper::init(QObject *object)
-{
-    Object::init();
-    qObj.init(object);
-}
-
 void QObjectWrapper::initializeBindings(ExecutionEngine *engine)
 {
     engine->functionPrototype()->defineDefaultProperty(QStringLiteral("connect"), method_connect);
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index 8b2fd506e8..504f6a69b8 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -78,7 +78,12 @@ namespace Heap {
 struct QQmlValueTypeWrapper;
 
 struct Q_QML_EXPORT QObjectWrapper : Object {
-    void init(QObject *object);
+    void init(QObject *object)
+    {
+        Object::init();
+        qObj.init(object);
+    }
+
     void destroy() {
         qObj.destroy();
         Object::destroy();
@@ -196,7 +201,7 @@ protected:
     static ReturnedValue method_disconnect(CallContext *ctx);
 
 private:
-    static ReturnedValue wrap_slowPath(ExecutionEngine *engine, QObject *object);
+    Q_NEVER_INLINE static ReturnedValue wrap_slowPath(ExecutionEngine *engine, QObject *object);
 };
 
 inline ReturnedValue QObjectWrapper::wrap(ExecutionEngine *engine, QObject *object)