Slightly accelerate access to value type properties

We can't do a fast property index based access on them, due to the inability to
read individual fields from the original object (i.e.  the logic in
QQmlValueTypeWrapper). However what we can determine and propagate is the type
information of the individual properties, i.e. that the x and y properties of a
QPointF are always doubles.

Change-Id: Iee71ece2117294b7bc0b93deb0a77d7c51148b11
Reviewed-by: Lars Knoll <lars.knoll@digia.com>

5 files changed, 84 insertions, 71 deletions

diff --git a/src/qml/compiler/qqmlcodegenerator.cpp b/src/qml/compiler/qqmlcodegenerator.cpp
index 24755ee672..974de72858 100644
--- a/src/qml/compiler/qqmlcodegenerator.cpp
+++ b/src/qml/compiler/qqmlcodegenerator.cpp
@@ -1330,9 +1330,10 @@ QQmlPropertyData *JSCodeGen::lookupQmlCompliantProperty(QQmlPropertyCache *cache
 static void initMetaObjectResolver(V4IR::MemberExpressionResolver *resolver, QQmlPropertyCache *metaObject);
 
 enum MetaObjectResolverFlags {
-    AllPropertiesAreFinal    = 0x1,
-    LookupsIncludeEnums      = 0x2,
-    LookupsExcludeProperties = 0x4
+    AllPropertiesAreFinal      = 0x1,
+    LookupsIncludeEnums        = 0x2,
+    LookupsExcludeProperties   = 0x4,
+    ResolveTypeInformationOnly = 0x8
 };
 
 static void initMetaObjectResolver(V4IR::MemberExpressionResolver *resolver, QQmlPropertyCache *metaObject);
@@ -1464,7 +1465,9 @@ static V4IR::Type resolveMetaObjectProperty(QQmlEnginePrivate *qmlEngine, V4IR::
 
                 if (isFinalProperty && metaObject->isAllowedInRevision(candidate)) {
                     property = candidate;
-                    member->property = candidate; // Cache for next iteration and isel needs it.
+                    member->inhibitTypeConversionOnWrite = true;
+                    if (!(resolver->flags & ResolveTypeInformationOnly))
+                        member->property = candidate; // Cache for next iteration and isel needs it.
                 }
             }
         }
@@ -1486,6 +1489,12 @@ static V4IR::Type resolveMetaObjectProperty(QQmlEnginePrivate *qmlEngine, V4IR::
                         initMetaObjectResolver(resolver, cache);
                         return V4IR::QObjectType;
                     }
+                } else if (QQmlValueType *valueType = QQmlValueTypeFactory::valueType(property->propType)) {
+                    if (QQmlPropertyCache *cache = qmlEngine->cache(valueType->metaObject())) {
+                        initMetaObjectResolver(resolver, cache);
+                        resolver->flags |= ResolveTypeInformationOnly;
+                        return V4IR::QObjectType;
+                    }
                 }
                 break;
             }
diff --git a/src/qml/compiler/qv4jsir_p.h b/src/qml/compiler/qv4jsir_p.h
index 9105a9137d..59e8d02bbc 100644
--- a/src/qml/compiler/qv4jsir_p.h
+++ b/src/qml/compiler/qv4jsir_p.h
@@ -562,6 +562,12 @@ struct Member: Expr {
     bool memberIsEnum : 1;
     bool freeOfSideEffects : 1;
 
+    // This is set for example for for QObject properties. All sorts of extra behavior
+    // is defined when writing to them, for example resettable properties are reset
+    // when writing undefined to them, and an exception is thrown when they're missing
+    // a reset function. And then there's also Qt.binding().
+    bool inhibitTypeConversionOnWrite: 1;
+
     void init(Expr *base, const QString *name, QQmlPropertyData *property = 0, int attachedPropertiesId = 0)
     {
         this->base = base;
@@ -571,6 +577,7 @@ struct Member: Expr {
         this->enumValue = 0;
         this->memberIsEnum = false;
         this->freeOfSideEffects = false;
+        this->inhibitTypeConversionOnWrite = property != 0;
     }
 
     void init(Expr *base, const QString *name, int enumValue)
@@ -582,6 +589,7 @@ struct Member: Expr {
         this->enumValue = enumValue;
         this->memberIsEnum = true;
         this->freeOfSideEffects = false;
+        this->inhibitTypeConversionOnWrite = false;
     }
 
     virtual void accept(ExprVisitor *v) { v->visitMember(this); }
diff --git a/src/qml/compiler/qv4ssa.cpp b/src/qml/compiler/qv4ssa.cpp
index 5e2c7ba722..249dfab660 100644
--- a/src/qml/compiler/qv4ssa.cpp
+++ b/src/qml/compiler/qv4ssa.cpp
@@ -1906,12 +1906,8 @@ protected:
             }
         }
 
-        // Don't convert when writing to QObject properties. All sorts of extra behavior
-        // is defined when writing to them, for example resettable properties are reset
-        // when writing undefined to them, and an exception is thrown when they're missing
-        // a reset function.
         const Member *targetMember = s->target->asMember();
-        const bool inhibitConversion = targetMember && targetMember->property;
+        const bool inhibitConversion = targetMember && targetMember->inhibitTypeConversionOnWrite;
 
         run(s->source, s->target->type, !inhibitConversion);
     }
diff --git a/src/qml/qml/qqmlvaluetype_p.h b/src/qml/qml/qqmlvaluetype_p.h
index c55b86b55a..bd44dfb0cf 100644
--- a/src/qml/qml/qqmlvaluetype_p.h
+++ b/src/qml/qml/qqmlvaluetype_p.h
@@ -169,8 +169,8 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlPointFValueType : public QQmlValueTypeBase<QPointF>
 {
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
     Q_OBJECT
 public:
     QQmlPointFValueType(QObject *parent = 0);
@@ -185,8 +185,8 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlPointValueType : public QQmlValueTypeBase<QPoint>
 {
-    Q_PROPERTY(int x READ x WRITE setX)
-    Q_PROPERTY(int y READ y WRITE setY)
+    Q_PROPERTY(int x READ x WRITE setX FINAL)
+    Q_PROPERTY(int y READ y WRITE setY FINAL)
     Q_OBJECT
 public:
     QQmlPointValueType(QObject *parent = 0);
@@ -201,8 +201,8 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlSizeFValueType : public QQmlValueTypeBase<QSizeF>
 {
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
+    Q_PROPERTY(qreal width READ width WRITE setWidth FINAL)
+    Q_PROPERTY(qreal height READ height WRITE setHeight FINAL)
     Q_OBJECT
 public:
     QQmlSizeFValueType(QObject *parent = 0);
@@ -217,8 +217,8 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlSizeValueType : public QQmlValueTypeBase<QSize>
 {
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
+    Q_PROPERTY(int width READ width WRITE setWidth FINAL)
+    Q_PROPERTY(int height READ height WRITE setHeight FINAL)
     Q_OBJECT
 public:
     QQmlSizeValueType(QObject *parent = 0);
@@ -233,10 +233,10 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlRectFValueType : public QQmlValueTypeBase<QRectF>
 {
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal width READ width WRITE setWidth)
-    Q_PROPERTY(qreal height READ height WRITE setHeight)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
+    Q_PROPERTY(qreal width READ width WRITE setWidth FINAL)
+    Q_PROPERTY(qreal height READ height WRITE setHeight FINAL)
     Q_OBJECT
 public:
     QQmlRectFValueType(QObject *parent = 0);
@@ -256,10 +256,10 @@ public:
 
 class Q_QML_PRIVATE_EXPORT QQmlRectValueType : public QQmlValueTypeBase<QRect>
 {
-    Q_PROPERTY(int x READ x WRITE setX)
-    Q_PROPERTY(int y READ y WRITE setY)
-    Q_PROPERTY(int width READ width WRITE setWidth)
-    Q_PROPERTY(int height READ height WRITE setHeight)
+    Q_PROPERTY(int x READ x WRITE setX FINAL)
+    Q_PROPERTY(int y READ y WRITE setY FINAL)
+    Q_PROPERTY(int width READ width WRITE setWidth FINAL)
+    Q_PROPERTY(int height READ height WRITE setHeight FINAL)
     Q_OBJECT
 public:
     QQmlRectValueType(QObject *parent = 0);
@@ -282,11 +282,11 @@ class Q_QML_PRIVATE_EXPORT QQmlEasingValueType : public QQmlValueTypeBase<QEasin
     Q_OBJECT
     Q_ENUMS(Type)
 
-    Q_PROPERTY(QQmlEasingValueType::Type type READ type WRITE setType)
-    Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude)
-    Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot)
-    Q_PROPERTY(qreal period READ period WRITE setPeriod)
-    Q_PROPERTY(QVariantList bezierCurve READ bezierCurve WRITE setBezierCurve)
+    Q_PROPERTY(QQmlEasingValueType::Type type READ type WRITE setType FINAL)
+    Q_PROPERTY(qreal amplitude READ amplitude WRITE setAmplitude FINAL)
+    Q_PROPERTY(qreal overshoot READ overshoot WRITE setOvershoot FINAL)
+    Q_PROPERTY(qreal period READ period WRITE setPeriod FINAL)
+    Q_PROPERTY(QVariantList bezierCurve READ bezierCurve WRITE setBezierCurve FINAL)
 public:
     enum Type {
         Linear = QEasingCurve::Linear,
diff --git a/src/quick/util/qquickvaluetypes_p.h b/src/quick/util/qquickvaluetypes_p.h
index 88570f3b6e..94db7a8729 100644
--- a/src/quick/util/qquickvaluetypes_p.h
+++ b/src/quick/util/qquickvaluetypes_p.h
@@ -64,10 +64,10 @@ void registerValueTypes();
 
 class Q_AUTOTEST_EXPORT QQuickColorValueType : public QQmlValueTypeBase<QColor>
 {
-    Q_PROPERTY(qreal r READ r WRITE setR)
-    Q_PROPERTY(qreal g READ g WRITE setG)
-    Q_PROPERTY(qreal b READ b WRITE setB)
-    Q_PROPERTY(qreal a READ a WRITE setA)
+    Q_PROPERTY(qreal r READ r WRITE setR FINAL)
+    Q_PROPERTY(qreal g READ g WRITE setG FINAL)
+    Q_PROPERTY(qreal b READ b WRITE setB FINAL)
+    Q_PROPERTY(qreal a READ a WRITE setA FINAL)
     Q_OBJECT
 public:
     QQuickColorValueType(QObject *parent = 0);
@@ -86,8 +86,8 @@ public:
 
 class Q_AUTOTEST_EXPORT QQuickVector2DValueType : public QQmlValueTypeBase<QVector2D>
 {
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
     Q_OBJECT
 public:
     QQuickVector2DValueType(QObject *parent = 0);
@@ -115,9 +115,9 @@ public:
 
 class Q_AUTOTEST_EXPORT QQuickVector3DValueType : public QQmlValueTypeBase<QVector3D>
 {
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal z READ z WRITE setZ)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
+    Q_PROPERTY(qreal z READ z WRITE setZ FINAL)
     Q_OBJECT
 public:
     QQuickVector3DValueType(QObject *parent = 0);
@@ -149,10 +149,10 @@ public:
 
 class Q_AUTOTEST_EXPORT QQuickVector4DValueType : public QQmlValueTypeBase<QVector4D>
 {
-    Q_PROPERTY(qreal x READ x WRITE setX)
-    Q_PROPERTY(qreal y READ y WRITE setY)
-    Q_PROPERTY(qreal z READ z WRITE setZ)
-    Q_PROPERTY(qreal w READ w WRITE setW)
+    Q_PROPERTY(qreal x READ x WRITE setX FINAL)
+    Q_PROPERTY(qreal y READ y WRITE setY FINAL)
+    Q_PROPERTY(qreal z READ z WRITE setZ FINAL)
+    Q_PROPERTY(qreal w READ w WRITE setW FINAL)
     Q_OBJECT
 public:
     QQuickVector4DValueType(QObject *parent = 0);
@@ -207,22 +207,22 @@ public:
 
 class Q_AUTOTEST_EXPORT QQuickMatrix4x4ValueType : public QQmlValueTypeBase<QMatrix4x4>
 {
-    Q_PROPERTY(qreal m11 READ m11 WRITE setM11)
-    Q_PROPERTY(qreal m12 READ m12 WRITE setM12)
-    Q_PROPERTY(qreal m13 READ m13 WRITE setM13)
-    Q_PROPERTY(qreal m14 READ m14 WRITE setM14)
-    Q_PROPERTY(qreal m21 READ m21 WRITE setM21)
-    Q_PROPERTY(qreal m22 READ m22 WRITE setM22)
-    Q_PROPERTY(qreal m23 READ m23 WRITE setM23)
-    Q_PROPERTY(qreal m24 READ m24 WRITE setM24)
-    Q_PROPERTY(qreal m31 READ m31 WRITE setM31)
-    Q_PROPERTY(qreal m32 READ m32 WRITE setM32)
-    Q_PROPERTY(qreal m33 READ m33 WRITE setM33)
-    Q_PROPERTY(qreal m34 READ m34 WRITE setM34)
-    Q_PROPERTY(qreal m41 READ m41 WRITE setM41)
-    Q_PROPERTY(qreal m42 READ m42 WRITE setM42)
-    Q_PROPERTY(qreal m43 READ m43 WRITE setM43)
-    Q_PROPERTY(qreal m44 READ m44 WRITE setM44)
+    Q_PROPERTY(qreal m11 READ m11 WRITE setM11 FINAL)
+    Q_PROPERTY(qreal m12 READ m12 WRITE setM12 FINAL)
+    Q_PROPERTY(qreal m13 READ m13 WRITE setM13 FINAL)
+    Q_PROPERTY(qreal m14 READ m14 WRITE setM14 FINAL)
+    Q_PROPERTY(qreal m21 READ m21 WRITE setM21 FINAL)
+    Q_PROPERTY(qreal m22 READ m22 WRITE setM22 FINAL)
+    Q_PROPERTY(qreal m23 READ m23 WRITE setM23 FINAL)
+    Q_PROPERTY(qreal m24 READ m24 WRITE setM24 FINAL)
+    Q_PROPERTY(qreal m31 READ m31 WRITE setM31 FINAL)
+    Q_PROPERTY(qreal m32 READ m32 WRITE setM32 FINAL)
+    Q_PROPERTY(qreal m33 READ m33 WRITE setM33 FINAL)
+    Q_PROPERTY(qreal m34 READ m34 WRITE setM34 FINAL)
+    Q_PROPERTY(qreal m41 READ m41 WRITE setM41 FINAL)
+    Q_PROPERTY(qreal m42 READ m42 WRITE setM42 FINAL)
+    Q_PROPERTY(qreal m43 READ m43 WRITE setM43 FINAL)
+    Q_PROPERTY(qreal m44 READ m44 WRITE setM44 FINAL)
     Q_OBJECT
 public:
     QQuickMatrix4x4ValueType(QObject *parent = 0);
@@ -288,18 +288,18 @@ class Q_AUTOTEST_EXPORT QQuickFontValueType : public QQmlValueTypeBase<QFont>
     Q_ENUMS(FontWeight)
     Q_ENUMS(Capitalization)
 
-    Q_PROPERTY(QString family READ family WRITE setFamily)
-    Q_PROPERTY(bool bold READ bold WRITE setBold)
-    Q_PROPERTY(FontWeight weight READ weight WRITE setWeight)
-    Q_PROPERTY(bool italic READ italic WRITE setItalic)
-    Q_PROPERTY(bool underline READ underline WRITE setUnderline)
-    Q_PROPERTY(bool overline READ overline WRITE setOverline)
-    Q_PROPERTY(bool strikeout READ strikeout WRITE setStrikeout)
-    Q_PROPERTY(qreal pointSize READ pointSize WRITE setPointSize)
-    Q_PROPERTY(int pixelSize READ pixelSize WRITE setPixelSize)
-    Q_PROPERTY(Capitalization capitalization READ capitalization WRITE setCapitalization)
-    Q_PROPERTY(qreal letterSpacing READ letterSpacing WRITE setLetterSpacing)
-    Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing)
+    Q_PROPERTY(QString family READ family WRITE setFamily FINAL)
+    Q_PROPERTY(bool bold READ bold WRITE setBold FINAL)
+    Q_PROPERTY(FontWeight weight READ weight WRITE setWeight FINAL)
+    Q_PROPERTY(bool italic READ italic WRITE setItalic FINAL)
+    Q_PROPERTY(bool underline READ underline WRITE setUnderline FINAL)
+    Q_PROPERTY(bool overline READ overline WRITE setOverline FINAL)
+    Q_PROPERTY(bool strikeout READ strikeout WRITE setStrikeout FINAL)
+    Q_PROPERTY(qreal pointSize READ pointSize WRITE setPointSize FINAL)
+    Q_PROPERTY(int pixelSize READ pixelSize WRITE setPixelSize FINAL)
+    Q_PROPERTY(Capitalization capitalization READ capitalization WRITE setCapitalization FINAL)
+    Q_PROPERTY(qreal letterSpacing READ letterSpacing WRITE setLetterSpacing FINAL)
+    Q_PROPERTY(qreal wordSpacing READ wordSpacing WRITE setWordSpacing FINAL)
 
 public:
     enum FontWeight { Light = QFont::Light,