Optimize property/alias data structures

We used to store property declarations and alias declarations in the same
properties array in CompiledData::Object. However at run-time the
QQmlVMEMetaObject implements them separately, using separate data structures
(in the meta-data) and (most importantly) using separate property id segments:
First the properties, then the aliases. By reflecting the same separation in
CompiledData::Object with property arrays and alias arrays, we can pave the way
for getting rid of the meta-data in QQmlVMEMetaObject.

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

1 files changed, 13 insertions, 1 deletions

diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 18daab9ce4..060c888cd8 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -235,6 +235,11 @@ struct Binding : public QV4::CompiledData::Binding
     Binding *next;
 };
 
+struct Alias : public QV4::CompiledData::Alias
+{
+    Alias *next;
+};
+
 struct Function
 {
     QQmlJS::AST::FunctionDeclaration *functionDeclaration;
@@ -270,13 +275,16 @@ struct Q_QML_PRIVATE_EXPORT Object
 public:
     quint32 inheritedTypeNameIndex;
     quint32 idIndex;
-    int indexOfDefaultProperty;
+    int indexOfDefaultPropertyOrAlias : 31;
+    int defaultPropertyIsAlias : 1;
 
     QV4::CompiledData::Location location;
     QV4::CompiledData::Location locationOfIdProperty;
 
     const Property *firstProperty() const { return properties->first; }
     int propertyCount() const { return properties->count; }
+    const Alias *firstAlias() const { return aliases->first; }
+    int aliasCount() const { return aliases->count; }
     const Signal *firstSignal() const { return qmlSignals->first; }
     int signalCount() const { return qmlSignals->count; }
     Binding *firstBinding() const { return bindings->first; }
@@ -294,6 +302,7 @@ public:
 
     QString appendSignal(Signal *signal);
     QString appendProperty(Property *prop, const QString &propertyName, bool isDefaultProperty, const QQmlJS::AST::SourceLocation &defaultToken, QQmlJS::AST::SourceLocation *errorLocation);
+    QString appendAlias(Alias *prop, const QString &aliasName, bool isDefaultProperty, const QQmlJS::AST::SourceLocation &defaultToken, QQmlJS::AST::SourceLocation *errorLocation);
     void appendFunction(QmlIR::Function *f);
 
     QString appendBinding(Binding *b, bool isListBinding);
@@ -309,6 +318,7 @@ private:
     friend struct IRLoader;
 
     PoolList<Property> *properties;
+    PoolList<Alias> *aliases;
     PoolList<Signal> *qmlSignals;
     PoolList<Binding> *bindings;
     PoolList<Function> *functions;
@@ -414,6 +424,8 @@ public:
     void appendBinding(const QQmlJS::AST::SourceLocation &qualifiedNameLocation, const QQmlJS::AST::SourceLocation &nameLocation, quint32 propertyNameIndex, QQmlJS::AST::Statement *value);
     void appendBinding(const QQmlJS::AST::SourceLocation &qualifiedNameLocation, const QQmlJS::AST::SourceLocation &nameLocation, quint32 propertyNameIndex, int objectIndex, bool isListItem = false, bool isOnAssignment = false);
 
+    bool appendAlias(QQmlJS::AST::UiPublicMember *node);
+
     Object *bindingsTarget() const;
 
     bool setId(const QQmlJS::AST::SourceLocation &idLocation, QQmlJS::AST::Statement *value);