Go through proper set() functions when writing to MemberData

This is required, so we only have to add the write barrier
in one place.

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

1 files changed, 10 insertions, 10 deletions

diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index bd677483b5..f322d5a001 100644
--- a/src/qml/jsruntime/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
@@ -59,7 +59,7 @@ ReturnedValue Lookup::lookup(const Value &thisObject, Object *o, PropertyAttribu
         if (index != UINT_MAX) {
             level = i;
             *attrs = obj->internalClass->propertyData.at(index);
-            Value *v = obj->propertyData(index);
+            const Value *v = obj->propertyData(index);
             return !attrs->isAccessor() ? v->asReturnedValue() : Object::getValue(thisObject, *v, *attrs);
         }
 
@@ -72,7 +72,7 @@ ReturnedValue Lookup::lookup(const Value &thisObject, Object *o, PropertyAttribu
         index = obj->internalClass->find(name);
         if (index != UINT_MAX) {
             *attrs = obj->internalClass->propertyData.at(index);
-            Value *v = obj->propertyData(index);
+            const Value *v = obj->propertyData(index);
             return !attrs->isAccessor() ? v->asReturnedValue() : Object::getValue(thisObject, *v, *attrs);
         }
 
@@ -94,7 +94,7 @@ ReturnedValue Lookup::lookup(const Object *thisObject, PropertyAttributes *attrs
         if (index != UINT_MAX) {
             level = i;
             *attrs = obj->internalClass->propertyData.at(index);
-            Value *v = obj->propertyData(index);
+            const Value *v = obj->propertyData(index);
             return !attrs->isAccessor() ? v->asReturnedValue() : thisObject->getValue(*v, *attrs);
         }
 
@@ -107,7 +107,7 @@ ReturnedValue Lookup::lookup(const Object *thisObject, PropertyAttributes *attrs
         index = obj->internalClass->find(name);
         if (index != UINT_MAX) {
             *attrs = obj->internalClass->propertyData.at(index);
-            Value *v = obj->propertyData(index);
+            const Value *v = obj->propertyData(index);
             return !attrs->isAccessor() ? v->asReturnedValue() : thisObject->getValue(*v, *attrs);
         }
 
@@ -772,7 +772,7 @@ void Lookup::setter0(Lookup *l, ExecutionEngine *engine, Value &object, const Va
 {
     Object *o = object.as<Object>();
     if (o && o->internalClass() == l->classList[0]) {
-        *o->propertyData(l->index) = value;
+        o->setProperty(l->index, value);
         return;
     }
 
@@ -785,7 +785,7 @@ void Lookup::setterInsert0(Lookup *l, ExecutionEngine *engine, Value &object, co
     if (o && o->internalClass() == l->classList[0]) {
         if (!o->prototype()) {
             o->setInternalClass(l->classList[3]);
-            *o->propertyData(l->index) = value;
+            o->setProperty(l->index, value);
             return;
         }
     }
@@ -801,7 +801,7 @@ void Lookup::setterInsert1(Lookup *l, ExecutionEngine *engine, Value &object, co
         Heap::Object *p = o->prototype();
         if (p && p->internalClass == l->classList[1]) {
             o->setInternalClass(l->classList[3]);
-            *o->propertyData(l->index) = value;
+            o->setProperty(l->index, value);
             return;
         }
     }
@@ -819,7 +819,7 @@ void Lookup::setterInsert2(Lookup *l, ExecutionEngine *engine, Value &object, co
             p = p->prototype;
             if (p && p->internalClass == l->classList[2]) {
                 o->setInternalClass(l->classList[3]);
-                *o->propertyData(l->index) = value;
+                o->setProperty(l->index, value);
                 return;
             }
         }
@@ -834,11 +834,11 @@ void Lookup::setter0setter0(Lookup *l, ExecutionEngine *engine, Value &object, c
     Object *o = object.as<Object>();
     if (o) {
         if (o->internalClass() == l->classList[0]) {
-            *o->propertyData(l->index) = value;
+            o->setProperty(l->index, value);
             return;
         }
         if (o->internalClass() == l->classList[1]) {
-            *o->propertyData(l->index2) = value;
+            o->setProperty(l->index2, value);
             return;
         }
     }