V4: Change both setter0 lookup methods to reflect getter0

The setter0Inline would do the index to offset calculation each time
it was called, while getter0Inline would do it once when creating the
lookup. Same for setter0Memberdata. Both setters now mirror the behavior
of their getter counterparts.

However, getterTwoClasses is more sophisticated than setterTwoClasses,
so there we still use the existing setter0setter0, but restore the
uncorrected index back into the two-class-lookup.

Change-Id: Ide29d0304e840b2e09d65bdfc216fa8da08d69dc
Reviewed-by: Ulf Hermann <ulf.hermann@qt.io>

1 files changed, 8 insertions, 8 deletions

diff --git a/src/qml/jsruntime/qv4object_p.h b/src/qml/jsruntime/qv4object_p.h
index ff47810994..3176355054 100644
--- a/src/qml/jsruntime/qv4object_p.h
+++ b/src/qml/jsruntime/qv4object_p.h
@@ -86,14 +86,14 @@ DECLARE_EXPORTED_HEAP_OBJECT(Object, Base) {
         Q_ASSERT(index < vtable()->nInlineProperties);
         return reinterpret_cast<const Value *>(this) + vtable()->inlinePropertyOffset + index;
     }
-    void setInlineProperty(ExecutionEngine *e, uint index, Value v) {
-        Q_ASSERT(index < vtable()->nInlineProperties);
-        Value *prop = reinterpret_cast<Value *>(this) + vtable()->inlinePropertyOffset + index;
+    void setInlinePropertyWithOffset(ExecutionEngine *e, uint indexWithOffset, Value v) {
+        Q_ASSERT(indexWithOffset >= vtable()->inlinePropertyOffset && indexWithOffset < vtable()->inlinePropertyOffset + vtable()->nInlineProperties);
+        Value *prop = reinterpret_cast<Value *>(this) + indexWithOffset;
         WriteBarrier::write(e, this, prop->data_ptr(), v.asReturnedValue());
     }
-    void setInlineProperty(ExecutionEngine *e, uint index, Heap::Base *b) {
-        Q_ASSERT(index < vtable()->nInlineProperties);
-        Value *prop = reinterpret_cast<Value *>(this) + vtable()->inlinePropertyOffset + index;
+    void setInlinePropertyWithOffset(ExecutionEngine *e, uint indexWithOffset, Heap::Base *b) {
+        Q_ASSERT(indexWithOffset >= vtable()->inlinePropertyOffset && indexWithOffset < vtable()->inlinePropertyOffset + vtable()->nInlineProperties);
+        Value *prop = reinterpret_cast<Value *>(this) + indexWithOffset;
         WriteBarrier::write(e, this, prop->data_ptr(), Value::fromHeapObject(b).asReturnedValue());
     }
 
@@ -115,7 +115,7 @@ DECLARE_EXPORTED_HEAP_OBJECT(Object, Base) {
     void setProperty(ExecutionEngine *e, uint index, Value v) {
         uint nInline = vtable()->nInlineProperties;
         if (index < nInline) {
-            setInlineProperty(e, index, v);
+            setInlinePropertyWithOffset(e, index + vtable()->inlinePropertyOffset, v);
             return;
         }
         index -= nInline;
@@ -124,7 +124,7 @@ DECLARE_EXPORTED_HEAP_OBJECT(Object, Base) {
     void setProperty(ExecutionEngine *e, uint index, Heap::Base *b) {
         uint nInline = vtable()->nInlineProperties;
         if (index < nInline) {
-            setInlineProperty(e, index, b);
+            setInlinePropertyWithOffset(e, index + vtable()->inlinePropertyOffset, b);
             return;
         }
         index -= nInline;