Optimize named object handling

By storing the object indices of named objects in the CompiledData::Object of a component,
we can achieve two things:

    (1) We can eliminate the hash of vectors in QQmlCompiledData for the object-to-id mapping
    (2) We can store the mapping from object name to integer object id in the CompilationUnit and
        share it across different QQmlContextData instances (as long as it is not modified).

Also added a new test that verifies the functionality of a .qml file starting
with Component{} itself with object names, something that was previously only
implicitly tested through some of the examples (corkboards.qml for example).

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

1 files changed, 11 insertions, 1 deletions

diff --git a/src/qml/jsruntime/qv4identifier_p.h b/src/qml/jsruntime/qv4identifier_p.h
index a3abfd8e13..2695bbc875 100644
--- a/src/qml/jsruntime/qv4identifier_p.h
+++ b/src/qml/jsruntime/qv4identifier_p.h
@@ -85,6 +85,7 @@ struct IdentifierHashEntry {
 struct IdentifierHashData
 {
     IdentifierHashData(int numBits);
+    explicit IdentifierHashData(IdentifierHashData *other);
     ~IdentifierHashData() {
         free(entries);
     }
@@ -115,6 +116,8 @@ struct IdentifierHashBase
     bool contains(const QString &str) const;
     bool contains(String *str) const;
 
+    void detach();
+
 protected:
     IdentifierHashEntry *addEntry(const Identifier *i);
     const IdentifierHashEntry *lookup(const Identifier *identifier) const;
@@ -141,6 +144,7 @@ struct IdentifierHash : public IdentifierHashBase
     }
 
     void add(const QString &str, const T &value);
+    void add(Heap::String *str, const T &value);
 
     inline T value(const QString &str) const;
     inline T value(String *str) const;
@@ -198,6 +202,13 @@ void IdentifierHash<T>::add(const QString &str, const T &value)
 }
 
 template<typename T>
+void IdentifierHash<T>::add(Heap::String *str, const T &value)
+{
+    IdentifierHashEntry *e = addEntry(toIdentifier(str));
+    e->value = value;
+}
+
+template<typename T>
 inline T IdentifierHash<T>::value(const QString &str) const
 {
     return IdentifierHashEntry::get(lookup(str), (T*)0);
@@ -223,7 +234,6 @@ QString IdentifierHash<T>::findId(T value) const
     return QString();
 }
 
-
 }
 
 QT_END_NAMESPACE