1 files changed, 121 insertions, 20 deletions

diff --git a/src/qml/compiler/qqmlirbuilder_p.h b/src/qml/compiler/qqmlirbuilder_p.h
index 057ed1be9f..cc16dc2104 100644
--- a/src/qml/compiler/qqmlirbuilder_p.h
+++ b/src/qml/compiler/qqmlirbuilder_p.h
@@ -113,7 +113,7 @@ struct PoolList
         T *insertPos = 0;
 
         for (T *it = first; it; it = it->next) {
-            if (!(it->*sortMember < item->*sortMember))
+            if (!(it->*sortMember <= item->*sortMember))
                 break;
             insertPos = it;
         }
@@ -161,6 +161,43 @@ struct PoolList
         }
         return result;
     }
+
+    struct Iterator {
+        T *ptr;
+
+        explicit Iterator(T *p) : ptr(p) {}
+
+        T *operator->() {
+            return ptr;
+        }
+
+        const T *operator->() const {
+            return ptr;
+        }
+
+        T &operator*() {
+            return *ptr;
+        }
+
+        const T &operator*() const {
+            return *ptr;
+        }
+
+        void operator++() {
+            ptr = ptr->next;
+        }
+
+        bool operator==(const Iterator &rhs) const {
+            return ptr == rhs.ptr;
+        }
+
+        bool operator!=(const Iterator &rhs) const {
+            return ptr != rhs.ptr;
+        }
+    };
+
+    Iterator begin() { return Iterator(first); }
+    Iterator end() { return Iterator(nullptr); }
 };
 
 template <typename T>
@@ -170,7 +207,18 @@ class FixedPoolArray
 public:
     int count;
 
-    void init(QQmlJS::MemoryPool *pool, const QVector<T> &vector)
+    FixedPoolArray()
+        : data(0)
+        , count(0)
+    {}
+
+    void allocate(QQmlJS::MemoryPool *pool, int size)
+    {
+        count = size;
+        data = reinterpret_cast<T*>(pool->allocate(count * sizeof(T)));
+    }
+
+    void allocate(QQmlJS::MemoryPool *pool, const QVector<T> &vector)
     {
         count = vector.count();
         data = reinterpret_cast<T*>(pool->allocate(count * sizeof(T)));
@@ -183,6 +231,16 @@ public:
         }
     }
 
+    template <typename Container>
+    void allocate(QQmlJS::MemoryPool *pool, const Container &container)
+    {
+        count = container.count();
+        data = reinterpret_cast<T*>(pool->allocate(count * sizeof(T)));
+        typename Container::ConstIterator it = container.constBegin();
+        for (int i = 0; i < count; ++i)
+            new (data + i) T(*it++);
+    }
+
     const T &at(int index) const {
         Q_ASSERT(index >= 0 && index < count);
         return data[index];
@@ -200,6 +258,9 @@ public:
                 return i;
         return -1;
     }
+
+    const T *begin() const { return data; }
+    const T *end() const { return data + count; }
 };
 
 struct Object;
@@ -217,6 +278,10 @@ struct Signal
 
     QStringList parameterStringList(const QV4::Compiler::StringTableGenerator *stringPool) const;
 
+    int parameterCount() const { return parameters->count; }
+    PoolList<SignalParameter>::Iterator parametersBegin() const { return parameters->begin(); }
+    PoolList<SignalParameter>::Iterator parametersEnd() const { return parameters->end(); }
+
     Signal *next;
 };
 
@@ -227,16 +292,32 @@ struct Property : public QV4::CompiledData::Property
 
 struct Binding : public QV4::CompiledData::Binding
 {
+    // The offset in the source file where the binding appeared. This is used for sorting to ensure
+    // that assignments to list properties are done in the correct order. We use the offset here instead
+    // of Binding::location as the latter has limited precision.
+    quint32 offset;
     // Binding's compiledScriptIndex is index in object's functionsAndExpressions
     Binding *next;
 };
 
+struct Alias : public QV4::CompiledData::Alias
+{
+    Alias *next;
+};
+
 struct Function
 {
     QQmlJS::AST::FunctionDeclaration *functionDeclaration;
     QV4::CompiledData::Location location;
     int nameIndex;
     quint32 index; // index in parsedQML::functions
+    FixedPoolArray<int> formals;
+
+    // --- QQmlPropertyCacheCreator interface
+    const int *formalsBegin() const { return formals.begin(); }
+    const int *formalsEnd() const { return formals.end(); }
+    // ---
+
     Function *next;
 };
 
@@ -265,14 +346,19 @@ struct Q_QML_PRIVATE_EXPORT Object
     Q_DECLARE_TR_FUNCTIONS(Object)
 public:
     quint32 inheritedTypeNameIndex;
-    quint32 idIndex;
-    int indexOfDefaultProperty;
+    quint32 idNameIndex;
+    int id;
+    int indexOfDefaultPropertyOrAlias;
+    bool defaultPropertyIsAlias;
+    quint32 flags;
 
     QV4::CompiledData::Location location;
     QV4::CompiledData::Location locationOfIdProperty;
 
     const Property *firstProperty() const { return properties->first; }
     int propertyCount() const { return properties->count; }
+    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; }
@@ -280,16 +366,28 @@ public:
     const Function *firstFunction() const { return functions->first; }
     int functionCount() const { return functions->count; }
 
+    PoolList<Binding>::Iterator bindingsBegin() const { return bindings->begin(); }
+    PoolList<Binding>::Iterator bindingsEnd() const { return bindings->end(); }
+    PoolList<Property>::Iterator propertiesBegin() const { return properties->begin(); }
+    PoolList<Property>::Iterator propertiesEnd() const { return properties->end(); }
+    PoolList<Alias>::Iterator aliasesBegin() const { return aliases->begin(); }
+    PoolList<Alias>::Iterator aliasesEnd() const { return aliases->end(); }
+    PoolList<Signal>::Iterator signalsBegin() const { return qmlSignals->begin(); }
+    PoolList<Signal>::Iterator signalsEnd() const { return qmlSignals->end(); }
+    PoolList<Function>::Iterator functionsBegin() const { return functions->begin(); }
+    PoolList<Function>::Iterator functionsEnd() const { return functions->end(); }
+
     // If set, then declarations for this object (and init bindings for these) should go into the
     // specified object. Used for declarations inside group properties.
     Object *declarationsOverride;
 
-    void init(QQmlJS::MemoryPool *pool, int typeNameIndex, int id, const QQmlJS::AST::SourceLocation &location = QQmlJS::AST::SourceLocation());
+    void init(QQmlJS::MemoryPool *pool, int typeNameIndex, int idIndex, const QQmlJS::AST::SourceLocation &location = QQmlJS::AST::SourceLocation());
 
     QString sanityCheckFunctionNames(const QSet<QString> &illegalNames, QQmlJS::AST::SourceLocation *errorLocation);
 
     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);
@@ -299,12 +397,17 @@ public:
     QString bindingAsString(Document *doc, int scriptIndex) const;
 
     PoolList<CompiledFunctionOrExpression> *functionsAndExpressions;
-    FixedPoolArray<int> *runtimeFunctionIndices;
+    FixedPoolArray<int> runtimeFunctionIndices;
+
+    FixedPoolArray<quint32> namedObjectsInComponent;
+    int namedObjectsInComponentCount() const { return namedObjectsInComponent.count; }
+    const quint32 *namedObjectsInComponentTable() const { return namedObjectsInComponent.begin(); }
 
 private:
     friend struct IRLoader;
 
     PoolList<Property> *properties;
+    PoolList<Alias> *aliases;
     PoolList<Signal> *qmlSignals;
     PoolList<Binding> *bindings;
     PoolList<Function> *functions;
@@ -330,15 +433,10 @@ struct Q_QML_PRIVATE_EXPORT Document
     QList<Pragma*> pragmas;
     QQmlJS::AST::UiProgram *program;
     int indexOfRootObject;
-    QList<Object*> objects;
+    QVector<Object*> objects;
     QV4::Compiler::JSUnitGenerator jsGenerator;
-    quint32 unitFlags;
 
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> javaScriptCompilationUnit;
-    QHash<int, QStringList> extraSignalParameters;
-
-    QV4::CompiledData::TypeReferenceMap typeReferences;
-    void collectTypeReferences();
 
     int registerString(const QString &str) { return jsGenerator.registerString(str); }
     QString stringAt(int index) const { return jsGenerator.stringForIndex(index); }
@@ -410,6 +508,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);
@@ -426,6 +526,7 @@ public:
     QString stringAt(int index) const { return jsGenerator->stringForIndex(index); }
 
     static bool isStatementNodeScript(QQmlJS::AST::Statement *statement);
+    static bool isRedundantNullInitializerForPropertyDeclaration(Property *property, QQmlJS::AST::Statement *statement);
 
     QList<QQmlJS::DiagnosticMessage> errors;
 
@@ -433,7 +534,7 @@ public:
 
     QList<const QV4::CompiledData::Import *> _imports;
     QList<Pragma*> _pragmas;
-    QList<Object*> _objects;
+    QVector<Object*> _objects;
 
     QV4::CompiledData::TypeReferenceMap _typeReferences;
 
@@ -447,21 +548,21 @@ public:
 
 struct Q_QML_PRIVATE_EXPORT QmlUnitGenerator
 {
-    QV4::CompiledData::Unit *generate(Document &output);
+    QV4::CompiledData::Unit *generate(Document &output, QQmlEngine *engine, const QV4::CompiledData::ResolvedTypeReferenceMap &dependentTypes);
 
 private:
     typedef bool (Binding::*BindingFilter)() const;
-    char *writeBindings(char *bindingPtr, Object *o, BindingFilter filter) const;
+    char *writeBindings(char *bindingPtr, const Object *o, BindingFilter filter) const;
 };
 
 #ifndef V4_BOOTSTRAP
 struct Q_QML_EXPORT PropertyResolver
 {
-    PropertyResolver(QQmlPropertyCache *cache)
+    PropertyResolver(const QQmlPropertyCache *cache)
         : cache(cache)
     {}
 
-    QQmlPropertyData *property(int index)
+    QQmlPropertyData *property(int index) const
     {
         return cache->property(index);
     }
@@ -471,12 +572,12 @@ struct Q_QML_EXPORT PropertyResolver
         IgnoreRevision
     };
 
-    QQmlPropertyData *property(const QString &name, bool *notInRevision = 0, RevisionCheck check = CheckRevision);
+    QQmlPropertyData *property(const QString &name, bool *notInRevision = 0, RevisionCheck check = CheckRevision) const;
 
     // This code must match the semantics of QQmlPropertyPrivate::findSignalByName
-    QQmlPropertyData *signal(const QString &name, bool *notInRevision);
+    QQmlPropertyData *signal(const QString &name, bool *notInRevision) const;
 
-    QQmlPropertyCache *cache;
+    const QQmlPropertyCache *cache;
 };
 #endif