Centralize deferred binding bit information in CompiledData::Binding

Ultimately the decision which bindings to initialize in a deferred way depends
on the data in the meta-object (deferred property names entry). The hash in
QQmlCompiledData is just caching this information. We are better off storing
this single bit right in the binding itself instead of in a parallel data
structure.

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

3 files changed, 19 insertions, 26 deletions

diff --git a/src/qml/qml/qqmlcompiler_p.h b/src/qml/qml/qqmlcompiler_p.h
index cd2c533150..c4883a6279 100644
--- a/src/qml/qml/qqmlcompiler_p.h
+++ b/src/qml/qml/qqmlcompiler_p.h
@@ -133,7 +133,6 @@ public:
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> compilationUnit;
     // hash key is object index, value is indicies of bindings covered by custom parser
     QHash<int, QBitArray> customParserBindings;
-    QHash<int, QBitArray> deferredBindingsPerObject; // index is object index
     int totalBindingsCount; // Number of bindings used in this type
     int totalParserStatusCount; // Number of instantiated types that are QQmlParserStatus subclasses
     int totalObjectCount; // Number of objects explicitly instantiated
diff --git a/src/qml/qml/qqmlobjectcreator.cpp b/src/qml/qml/qqmlobjectcreator.cpp
index 9dba7f30d8..0607e02173 100644
--- a/src/qml/qml/qqmlobjectcreator.cpp
+++ b/src/qml/qml/qqmlobjectcreator.cpp
@@ -255,11 +255,7 @@ bool QQmlObjectCreator::populateDeferredProperties(QObject *instance)
     qSwap(_bindingTarget, bindingTarget);
     qSwap(_vmeMetaObject, vmeMetaObject);
 
-    QBitArray bindingSkipList = compiledData->deferredBindingsPerObject.value(_compiledObjectIndex);
-    for (int i = 0; i < bindingSkipList.count(); ++i)
-        bindingSkipList.setBit(i, !bindingSkipList.testBit(i));
-
-    setupBindings(bindingSkipList);
+    setupBindings(/*binding skip list*/QBitArray(), /*applyDeferredBindings=*/true);
 
     qSwap(_vmeMetaObject, vmeMetaObject);
     qSwap(_bindingTarget, bindingTarget);
@@ -626,7 +622,7 @@ static QQmlType *qmlTypeForObject(QObject *object)
     return type;
 }
 
-void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip)
+void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip, bool applyDeferredBindings)
 {
     QQmlListProperty<void> savedList;
     qSwap(_currentList, savedList);
@@ -680,6 +676,14 @@ void QQmlObjectCreator::setupBindings(const QBitArray &bindingsToSkip)
         if (static_cast<int>(i) < bindingsToSkip.size() && bindingsToSkip.testBit(i))
             continue;
 
+        if (binding->flags & QV4::CompiledData::Binding::IsDeferredBinding) {
+            if (!applyDeferredBindings)
+                continue;
+        } else {
+            if (applyDeferredBindings)
+                continue;
+        }
+
         const QQmlPropertyData *property = propertyData.at(i);
 
         if (property && property->isQList()) {
@@ -1299,28 +1303,18 @@ bool QQmlObjectCreator::populateInstance(int index, QObject *instance, QObject *
     qSwap(_propertyCache, cache);
     qSwap(_vmeMetaObject, vmeMetaObject);
 
-    QBitArray bindingSkipList = bindingsToSkip;
-    {
-        QHash<int, QBitArray>::ConstIterator deferredBindings = compiledData->deferredBindingsPerObject.constFind(_compiledObjectIndex);
-        if (deferredBindings != compiledData->deferredBindingsPerObject.constEnd()) {
-            if (bindingSkipList.isEmpty())
-                bindingSkipList.resize(deferredBindings->count());
-
-            for (int i = 0; i < deferredBindings->count(); ++i)
-                if (deferredBindings->testBit(i))
-                    bindingSkipList.setBit(i);
-            QQmlData::DeferredData *deferData = new QQmlData::DeferredData;
-            deferData->deferredIdx = _compiledObjectIndex;
-            deferData->compiledData = compiledData;
-            deferData->compiledData->addref();
-            deferData->context = context;
-            _ddata->deferredData = deferData;
-        }
+    if (_compiledObject->flags & QV4::CompiledData::Object::HasDeferredBindings) {
+        QQmlData::DeferredData *deferData = new QQmlData::DeferredData;
+        deferData->deferredIdx = _compiledObjectIndex;
+        deferData->compiledData = compiledData;
+        deferData->compiledData->addref();
+        deferData->context = context;
+        _ddata->deferredData = deferData;
     }
 
     if (_compiledObject->nFunctions > 0)
         setupFunctions();
-    setupBindings(bindingSkipList);
+    setupBindings(bindingsToSkip);
 
     qSwap(_vmeMetaObject, vmeMetaObject);
     qSwap(_bindingTarget, bindingTarget);
diff --git a/src/qml/qml/qqmlobjectcreator_p.h b/src/qml/qml/qqmlobjectcreator_p.h
index 730237acfe..d0ed38334d 100644
--- a/src/qml/qml/qqmlobjectcreator_p.h
+++ b/src/qml/qml/qqmlobjectcreator_p.h
@@ -114,7 +114,7 @@ private:
                           QObject *bindingTarget, const QQmlPropertyData *valueTypeProperty,
                           const QBitArray &bindingsToSkip = QBitArray());
 
-    void setupBindings(const QBitArray &bindingsToSkip);
+    void setupBindings(const QBitArray &bindingsToSkip, bool applyDeferredBindings = false);
     bool setPropertyBinding(const QQmlPropertyData *property, const QV4::CompiledData::Binding *binding);
     void setPropertyValue(const QQmlPropertyData *property, const QV4::CompiledData::Binding *binding);
     void setupFunctions();