1 files changed, 15 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp
index 994daa864b..1b6cdcbd14 100644
--- a/src/qml/jsruntime/qv4lookup.cpp
+++ b/src/qml/jsruntime/qv4lookup.cpp
@@ -486,8 +486,15 @@ bool Lookup::resolveSetter(ExecutionEngine *engine, Object *object, const Value
             return setter(this, engine, *object, value);
         } else if (idx.attrs.isData() && idx.attrs.isWritable()) {
             objectLookup.ic = object->internalClass();
-            objectLookup.offset = idx.index;
-            setter = idx.index < object->d()->vtable()->nInlineProperties ? Lookup::setter0Inline : Lookup::setter0;
+            objectLookup.index = idx.index;
+            const auto nInline = object->d()->vtable()->nInlineProperties;
+            if (idx.index < nInline) {
+                setter = Lookup::setter0Inline;
+                objectLookup.offset = idx.index + object->d()->vtable()->inlinePropertyOffset;
+            } else {
+                setter = Lookup::setter0MemberData;
+                objectLookup.offset = idx.index - nInline;
+            }
             return setter(this, engine, *object, value);
         } else {
             // ### handle setter
@@ -545,11 +552,11 @@ bool Lookup::setterTwoClasses(Lookup *l, ExecutionEngine *engine, Value &object,
             return false;
         }
 
-        if (l->setter == Lookup::setter0 || l->setter == Lookup::setter0Inline) {
+        if (l->setter == Lookup::setter0MemberData || l->setter == Lookup::setter0Inline) {
             l->objectLookupTwoClasses.ic = first.objectLookup.ic;
             l->objectLookupTwoClasses.ic2 = second.objectLookup.ic;
-            l->objectLookupTwoClasses.offset = first.objectLookup.offset;
-            l->objectLookupTwoClasses.offset2 = second.objectLookup.offset;
+            l->objectLookupTwoClasses.offset = first.objectLookup.index;
+            l->objectLookupTwoClasses.offset2 = second.objectLookup.index;
             l->setter = setter0setter0;
             return true;
         }
@@ -570,11 +577,11 @@ bool Lookup::setterFallback(Lookup *l, ExecutionEngine *engine, Value &object, c
     return o->put(name, value);
 }
 
-bool Lookup::setter0(Lookup *l, ExecutionEngine *engine, Value &object, const Value &value)
+bool Lookup::setter0MemberData(Lookup *l, ExecutionEngine *engine, Value &object, const Value &value)
 {
     Heap::Object *o = static_cast<Heap::Object *>(object.heapObject());
     if (o && o->internalClass == l->objectLookup.ic) {
-        o->setProperty(engine, l->objectLookup.offset, value);
+        o->memberData->values.set(engine, l->objectLookup.offset, value);
         return true;
     }
 
@@ -585,7 +592,7 @@ bool Lookup::setter0Inline(Lookup *l, ExecutionEngine *engine, Value &object, co
 {
     Heap::Object *o = static_cast<Heap::Object *>(object.heapObject());
     if (o && o->internalClass == l->objectLookup.ic) {
-        o->setInlineProperty(engine, l->objectLookup.offset, value);
+        o->setInlinePropertyWithOffset(engine, l->objectLookup.offset, value);
         return true;
     }