QtQml: Move BindingPropertyData into the base CU

Change-Id: I2edcb2c324919a1131ae490bee9c9b1140097b09
Reviewed-by: Fabian Kosmale <fabian.kosmale@qt.io>

1 files changed, 6 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4executablecompilationunit_p.h b/src/qml/jsruntime/qv4executablecompilationunit_p.h
index c8e8d05aac..11adcb79cd 100644
--- a/src/qml/jsruntime/qv4executablecompilationunit_p.h
+++ b/src/qml/jsruntime/qv4executablecompilationunit_p.h
@@ -33,9 +33,6 @@ class QQmlEnginePrivate;
 
 namespace QV4 {
 
-// index is per-object binding index
-typedef QVector<const QQmlPropertyData *> BindingPropertyData;
-
 class CompilationUnitMapper;
 class ResolvedTypeReference;
 // map from name index
@@ -93,11 +90,6 @@ public:
 
     QQmlRefPointer<QQmlTypeNameCache> typeNameCache;
 
-    // index is object index. This allows fast access to the
-    // property data when initializing bindings, avoiding expensive
-    // lookups by string (property name).
-    QVector<BindingPropertyData> bindingPropertyDataPerObject;
-
     // mapping from component object index (CompiledData::Unit object index that points to component) to identifier hash of named objects
     // this is initialized on-demand by QQmlContextData
     QHash<int, IdentifierHash> namedObjectsPerComponentCache;
@@ -299,6 +291,12 @@ public:
 
     QString stringAt(uint index) const { return m_compilationUnit->stringAt(index); }
 
+    const CompiledData::BindingPropertyData *bindingPropertyDataPerObjectAt(
+            qsizetype objectIndex) const
+    {
+        return &m_compilationUnit->bindingPropertyDataPerObject.at(objectIndex);
+    }
+
     QQmlRefPointer<QV4::CompiledData::CompilationUnit> baseCompilationUnit() const
     {
         return m_compilationUnit;