Unify MemberData::Index and ArrayData::Index

Both classes basically did the same thing. Unify them in a new
PropertyIndex class.

Change-Id: Ieb6fb670e4d204bf20ee4c0b70b4381c95c6268e
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

1 files changed, 13 insertions, 0 deletions

diff --git a/src/qml/jsruntime/qv4property_p.h b/src/qml/jsruntime/qv4property_p.h
index 7cb106c424..26dc7a83c3 100644
--- a/src/qml/jsruntime/qv4property_p.h
+++ b/src/qml/jsruntime/qv4property_p.h
@@ -142,6 +142,19 @@ inline void Property::merge(PropertyAttributes &attrs, const Property *other, Pr
     }
 }
 
+struct PropertyIndex {
+    Heap::Base *base;
+    Value *slot;
+
+    void set(EngineBase *e, Value newVal) {
+        WriteBarrier::write(e, base, slot->data_ptr(), newVal.asReturnedValue());
+    }
+    const Value *operator->() const { return slot; }
+    const Value &operator*() const { return *slot; }
+    bool isNull() const { return !slot; }
+};
+
+
 }
 
 Q_DECLARE_TYPEINFO(QV4::Property, Q_MOVABLE_TYPE);