Simplify VME meta object meta-data

For each type of VME meta object we store an array of integers holding the
meta-type ids of the QML declared properties. We can replace that array with
access to the QV4::CompiledData::Property entry for each property, where the
type is also accessible.

This is a fairly straight-forward change, except for the bit in
QV4::CompilationUnit where we delay the release of the CompiledData::Unit and
friends until the destructor instead of releasing it at unlink time. That
should be a safe change and is necessary as there are a few tests around where
the VME meta object still needs access to this meta-data at a very late stage
in the life-cycle right before the deferred deletion is run.

Change-Id: I431de15d12766df837c0e0251192df16a5a76868
Reviewed-by: Lars Knoll <lars.knoll@theqtcompany.com>

1 files changed, 109 insertions, 59 deletions

diff --git a/src/qml/qml/qqmlvmemetaobject.cpp b/src/qml/qml/qqmlvmemetaobject.cpp
index 8211a834ec..14d2e39ccb 100644
--- a/src/qml/qml/qqmlvmemetaobject.cpp
+++ b/src/qml/qml/qqmlvmemetaobject.cpp
@@ -304,23 +304,25 @@ QAbstractDynamicMetaObject *QQmlInterceptorMetaObject::toDynamicMetaObject(QObje
 
 QQmlVMEMetaObject::QQmlVMEMetaObject(QObject *obj,
                                      QQmlPropertyCache *cache,
-                                     const QQmlVMEMetaData *meta)
+                                     const QQmlVMEMetaData *meta, QV4::CompiledData::CompilationUnit *qmlCompilationUnit, int qmlObjectId)
     : QQmlInterceptorMetaObject(obj, cache),
       ctxt(QQmlData::get(obj, true)->outerContext), metaData(meta),
-      aliasEndpoints(0)
+      aliasEndpoints(0), compilationUnit(qmlCompilationUnit), compiledObject(0)
 {
     cache->addref();
 
     QQmlData::get(obj)->hasVMEMetaObject = true;
 
     if (metaData->propertyCount || metaData->methodCount) {
+        Q_ASSERT(compilationUnit);
+        Q_ASSERT(qmlObjectId >= 0);
+        compiledObject = compilationUnit->data->objectAt(qmlObjectId);
         Q_ASSERT(cache && cache->engine);
         QV4::ExecutionEngine *v4 = cache->engine;
         QV4::Heap::MemberData *data = QV4::MemberData::allocate(v4, metaData->propertyCount + metaData->methodCount);
         propertyAndMethodStorage.set(v4, data);
         std::fill(data->data, data->data + data->size, QV4::Encode::undefined());
 
-
         // Need JS wrapper to ensure properties/methods are marked.
         ensureQObjectWrapper();
     }
@@ -615,11 +617,11 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
         if (id >= propOffset()) {
             id -= propOffset();
 
-            if (id < metaData->propertyCount) {
-               int t = (metaData->propertyData() + id)->propertyType;
+            if (id < metaData->propertyCount && compiledObject) {
+                const QV4::CompiledData::Property::Type t = static_cast<QV4::CompiledData::Property::Type>(compiledObject->propertyTable()[id].type);
                 bool needActivate = false;
 
-                if (t == QQmlVMEMetaData::VarPropertyType) {
+                if (t == QV4::CompiledData::Property::Var) {
                     // the context can be null if accessing var properties from cpp after re-parenting an item.
                     QQmlEnginePrivate *ep = (ctxt == 0 || ctxt->engine == 0) ? 0 : QQmlEnginePrivate::get(ctxt->engine);
                     QV8Engine *v8e = (ep == 0) ? 0 : ep->v8engine();
@@ -635,131 +637,179 @@ int QQmlVMEMetaObject::metaCall(QObject *o, QMetaObject::Call c, int _id, void *
                     }
 
                 } else {
+                    int fallbackMetaType = QMetaType::UnknownType;
+                    switch (t) {
+                    case QV4::CompiledData::Property::Font:
+                        fallbackMetaType = QMetaType::QFont;
+                        break;
+                    case QV4::CompiledData::Property::Time:
+                        fallbackMetaType = QMetaType::QTime;
+                        break;
+                    case QV4::CompiledData::Property::Color:
+                        fallbackMetaType = QMetaType::QColor;
+                        break;
+                    case QV4::CompiledData::Property::Vector2D:
+                        fallbackMetaType = QMetaType::QVector2D;
+                        break;
+                    case QV4::CompiledData::Property::Vector3D:
+                        fallbackMetaType = QMetaType::QVector3D;
+                        break;
+                    case QV4::CompiledData::Property::Vector4D:
+                        fallbackMetaType = QMetaType::QVector4D;
+                        break;
+                    case QV4::CompiledData::Property::Matrix4x4:
+                        fallbackMetaType = QMetaType::QMatrix4x4;
+                        break;
+                    case QV4::CompiledData::Property::Quaternion:
+                        fallbackMetaType = QMetaType::QQuaternion;
+                        break;
+                    default: break;
+                    }
+
 
                     if (c == QMetaObject::ReadProperty) {
-                        switch(t) {
-                        case QVariant::Int:
+                        switch (t) {
+                        case QV4::CompiledData::Property::Int:
                             *reinterpret_cast<int *>(a[0]) = readPropertyAsInt(id);
                             break;
-                        case QVariant::Bool:
+                        case QV4::CompiledData::Property::Bool:
                             *reinterpret_cast<bool *>(a[0]) = readPropertyAsBool(id);
                             break;
-                        case QVariant::Double:
+                        case QV4::CompiledData::Property::Real:
                             *reinterpret_cast<double *>(a[0]) = readPropertyAsDouble(id);
                             break;
-                        case QVariant::String:
+                        case QV4::CompiledData::Property::String:
                             *reinterpret_cast<QString *>(a[0]) = readPropertyAsString(id);
                             break;
-                        case QVariant::Url:
+                        case QV4::CompiledData::Property::Url:
                             *reinterpret_cast<QUrl *>(a[0]) = readPropertyAsUrl(id);
                             break;
-                        case QVariant::Date:
+                        case QV4::CompiledData::Property::Date:
                             *reinterpret_cast<QDate *>(a[0]) = readPropertyAsDate(id);
                             break;
-                        case QVariant::DateTime:
+                        case QV4::CompiledData::Property::DateTime:
                             *reinterpret_cast<QDateTime *>(a[0]) = readPropertyAsDateTime(id);
                             break;
-                        case QVariant::RectF:
+                        case QV4::CompiledData::Property::Rect:
                             *reinterpret_cast<QRectF *>(a[0]) = readPropertyAsRectF(id);
                             break;
-                        case QVariant::SizeF:
+                        case QV4::CompiledData::Property::Size:
                             *reinterpret_cast<QSizeF *>(a[0]) = readPropertyAsSizeF(id);
                             break;
-                        case QVariant::PointF:
+                        case QV4::CompiledData::Property::Point:
                             *reinterpret_cast<QPointF *>(a[0]) = readPropertyAsPointF(id);
                             break;
-                        case QMetaType::QObjectStar:
+                        case QV4::CompiledData::Property::Custom:
                             *reinterpret_cast<QObject **>(a[0]) = readPropertyAsQObject(id);
                             break;
-                        case QMetaType::QVariant:
+                        case QV4::CompiledData::Property::Variant:
                             *reinterpret_cast<QVariant *>(a[0]) = readPropertyAsVariant(id);
                             break;
-                        default:
-                        {
-                            if (t == qMetaTypeId<QQmlListProperty<QObject> >()) {
-                                QList<QObject *> *list = readPropertyAsList(id);
-                                QQmlListProperty<QObject> *p = static_cast<QQmlListProperty<QObject> *>(a[0]);
-                                *p = QQmlListProperty<QObject>(object, list,
-                                                                      list_append, list_count, list_at,
-                                                                      list_clear);
-                                p->dummy1 = this;
-                                p->dummy2 = reinterpret_cast<void *>(quintptr(methodOffset() + id));
-                            } else {
-                                QV4::MemberData *md = propertyAndMethodStorageAsMemberData();
-                                if (md) {
-                                    QV4::VariantObject *v = (md->data() + id)->as<QV4::VariantObject>();
-                                    if (v)
-                                        QQml_valueTypeProvider()->readValueType(v->d()->data, a[0], t);
-                                }
-                            }
+                        case QV4::CompiledData::Property::CustomList: {
+                            QList<QObject *> *list = readPropertyAsList(id);
+                            QQmlListProperty<QObject> *p = static_cast<QQmlListProperty<QObject> *>(a[0]);
+                            *p = QQmlListProperty<QObject>(object, list,
+                                                                  list_append, list_count, list_at,
+                                                                  list_clear);
+                            p->dummy1 = this;
+                            p->dummy2 = reinterpret_cast<void *>(quintptr(methodOffset() + id));
                             break;
                         }
+                        case QV4::CompiledData::Property::Font:
+                        case QV4::CompiledData::Property::Time:
+                        case QV4::CompiledData::Property::Color:
+                        case QV4::CompiledData::Property::Vector2D:
+                        case QV4::CompiledData::Property::Vector3D:
+                        case QV4::CompiledData::Property::Vector4D:
+                        case QV4::CompiledData::Property::Matrix4x4:
+                        case QV4::CompiledData::Property::Quaternion:
+                            Q_ASSERT(fallbackMetaType != QMetaType::UnknownType);
+                            if (QV4::MemberData *md = propertyAndMethodStorageAsMemberData()) {
+                                QV4::VariantObject *v = (md->data() + id)->as<QV4::VariantObject>();
+                                if (v)
+                                    QQml_valueTypeProvider()->readValueType(v->d()->data, a[0], fallbackMetaType);
+                            }
+                            break;
+                        case QV4::CompiledData::Property::Var:
+                            Q_UNREACHABLE();
                         }
 
                     } else if (c == QMetaObject::WriteProperty) {
 
                         switch(t) {
-                        case QVariant::Int:
+                        case QV4::CompiledData::Property::Int:
                             needActivate = *reinterpret_cast<int *>(a[0]) != readPropertyAsInt(id);
                             writeProperty(id, *reinterpret_cast<int *>(a[0]));
                             break;
-                        case QVariant::Bool:
+                        case QV4::CompiledData::Property::Bool:
                             needActivate = *reinterpret_cast<bool *>(a[0]) != readPropertyAsBool(id);
                             writeProperty(id, *reinterpret_cast<bool *>(a[0]));
                             break;
-                        case QVariant::Double:
+                        case QV4::CompiledData::Property::Real:
                             needActivate = *reinterpret_cast<double *>(a[0]) != readPropertyAsDouble(id);
                             writeProperty(id, *reinterpret_cast<double *>(a[0]));
                             break;
-                        case QVariant::String:
+                        case QV4::CompiledData::Property::String:
                             needActivate = *reinterpret_cast<QString *>(a[0]) != readPropertyAsString(id);
                             writeProperty(id, *reinterpret_cast<QString *>(a[0]));
                             break;
-                        case QVariant::Url:
+                        case QV4::CompiledData::Property::Url:
                             needActivate = *reinterpret_cast<QUrl *>(a[0]) != readPropertyAsUrl(id);
                             writeProperty(id, *reinterpret_cast<QUrl *>(a[0]));
                             break;
-                        case QVariant::Date:
+                        case QV4::CompiledData::Property::Date:
                             needActivate = *reinterpret_cast<QDate *>(a[0]) != readPropertyAsDate(id);
                             writeProperty(id, *reinterpret_cast<QDate *>(a[0]));
                             break;
-                        case QVariant::DateTime:
+                        case QV4::CompiledData::Property::DateTime:
                             needActivate = *reinterpret_cast<QDateTime *>(a[0]) != readPropertyAsDateTime(id);
                             writeProperty(id, *reinterpret_cast<QDateTime *>(a[0]));
                             break;
-                        case QVariant::RectF:
+                        case QV4::CompiledData::Property::Rect:
                             needActivate = *reinterpret_cast<QRectF *>(a[0]) != readPropertyAsRectF(id);
                             writeProperty(id, *reinterpret_cast<QRectF *>(a[0]));
                             break;
-                        case QVariant::SizeF:
+                        case QV4::CompiledData::Property::Size:
                             needActivate = *reinterpret_cast<QSizeF *>(a[0]) != readPropertyAsSizeF(id);
                             writeProperty(id, *reinterpret_cast<QSizeF *>(a[0]));
                             break;
-                        case QVariant::PointF:
+                        case QV4::CompiledData::Property::Point:
                             needActivate = *reinterpret_cast<QPointF *>(a[0]) != readPropertyAsPointF(id);
                             writeProperty(id, *reinterpret_cast<QPointF *>(a[0]));
                             break;
-                        case QMetaType::QObjectStar:
+                        case QV4::CompiledData::Property::Custom:
                             needActivate = *reinterpret_cast<QObject **>(a[0]) != readPropertyAsQObject(id);
                             writeProperty(id, *reinterpret_cast<QObject **>(a[0]));
                             break;
-                        case QMetaType::QVariant:
+                        case QV4::CompiledData::Property::Variant:
                             writeProperty(id, *reinterpret_cast<QVariant *>(a[0]));
                             break;
-                        default: {
-                            QV4::MemberData *md = propertyAndMethodStorageAsMemberData();
-                            if (md) {
+                        case QV4::CompiledData::Property::CustomList:
+                            // Writing such a property is not supported. Content is added through the list property
+                            // methods.
+                            break;
+                        case QV4::CompiledData::Property::Font:
+                        case QV4::CompiledData::Property::Time:
+                        case QV4::CompiledData::Property::Color:
+                        case QV4::CompiledData::Property::Vector2D:
+                        case QV4::CompiledData::Property::Vector3D:
+                        case QV4::CompiledData::Property::Vector4D:
+                        case QV4::CompiledData::Property::Matrix4x4:
+                        case QV4::CompiledData::Property::Quaternion:
+                            Q_ASSERT(fallbackMetaType != QMetaType::UnknownType);
+                            if (QV4::MemberData *md = propertyAndMethodStorageAsMemberData()) {
                                 QV4::VariantObject *v = (md->data() + id)->as<QV4::VariantObject>();
                                 if (!v) {
                                     *(md->data() + id) = cache->engine->newVariantObject(QVariant());
                                     v = (md->data() + id)->as<QV4::VariantObject>();
-                                    QQml_valueTypeProvider()->initValueType(t, v->d()->data);
+                                    QQml_valueTypeProvider()->initValueType(fallbackMetaType, v->d()->data);
                                 }
-                                needActivate = !QQml_valueTypeProvider()->equalValueType(t, a[0], v->d()->data);
-                                QQml_valueTypeProvider()->writeValueType(t, a[0], v->d()->data);
+                                needActivate = !QQml_valueTypeProvider()->equalValueType(fallbackMetaType, a[0], v->d()->data);
+                                QQml_valueTypeProvider()->writeValueType(fallbackMetaType, a[0], v->d()->data);
                             }
                             break;
-                        }
+                        case QV4::CompiledData::Property::Var:
+                            Q_UNREACHABLE();
                         }
                     }
 
@@ -914,7 +964,7 @@ QV4::ReturnedValue QQmlVMEMetaObject::method(int index)
 
 QV4::ReturnedValue QQmlVMEMetaObject::readVarProperty(int id)
 {
-    Q_ASSERT((metaData->propertyData() + id)->propertyType == QQmlVMEMetaData::VarPropertyType);
+    Q_ASSERT(compiledObject && compiledObject->propertyTable()[id].type == QV4::CompiledData::Property::Var);
 
     QV4::MemberData *md = propertyAndMethodStorageAsMemberData();
     if (md)
@@ -939,7 +989,7 @@ QVariant QQmlVMEMetaObject::readPropertyAsVariant(int id)
 
 void QQmlVMEMetaObject::writeVarProperty(int id, const QV4::Value &value)
 {
-    Q_ASSERT((metaData->propertyData() + id)->propertyType == QQmlVMEMetaData::VarPropertyType);
+    Q_ASSERT(compiledObject && compiledObject->propertyTable()[id].type == QV4::CompiledData::Property::Var);
 
     QV4::MemberData *md = propertyAndMethodStorageAsMemberData();
     if (!md)
@@ -979,7 +1029,7 @@ void QQmlVMEMetaObject::writeVarProperty(int id, const QV4::Value &value)
 
 void QQmlVMEMetaObject::writeProperty(int id, const QVariant &value)
 {
-    if ((metaData->propertyData() + id)->propertyType == QQmlVMEMetaData::VarPropertyType) {
+    if (compiledObject && compiledObject->propertyTable()[id].type == QV4::CompiledData::Property::Var) {
         QV4::MemberData *md = propertyAndMethodStorageAsMemberData();
         if (!md)
             return;