Move MemberData over to new storage layout

Change-Id: I971b614d471e49d1be2e9474c985cb93ed7e2117
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>

1 files changed, 14 insertions, 7 deletions

diff --git a/src/qml/jsruntime/qv4memberdata_p.h b/src/qml/jsruntime/qv4memberdata_p.h
index e0f632b1ed..5f63be84b4 100644
--- a/src/qml/jsruntime/qv4memberdata_p.h
+++ b/src/qml/jsruntime/qv4memberdata_p.h
@@ -50,12 +50,19 @@ namespace QV4 {
 
 struct MemberData : Managed
 {
-    V4_MANAGED
-    uint size;
-    Value data[1];
+    struct Data : Managed::Data {
+        uint size;
+        Value data[1];
+    };
+    struct {
+        uint size;
+        Value data[1];
+    } __data;
+
+    V4_MANAGED_NEW
 
     MemberData(QV4::InternalClass *ic) : Managed(ic) {}
-    Value &operator[] (uint idx) { return data[idx]; }
+    Value &operator[] (uint idx) { return d()->data[idx]; }
 
     static void markObjects(Managed *that, ExecutionEngine *e);
 };
@@ -64,10 +71,10 @@ struct Members : Value
 {
     void reset() { m = 0; }
     void ensureIndex(QV4::ExecutionEngine *e, uint idx);
-    Value &operator[] (uint idx) const { return static_cast<MemberData *>(managed())->data[idx]; }
-    inline uint size() const { return d() ? d()->size : 0; }
+    Value &operator[] (uint idx) const { return static_cast<MemberData *>(managed())->d()->data[idx]; }
+    inline uint size() const { return d() ? d()->d()->size : 0; }
     inline MemberData *d() const { return static_cast<MemberData *>(managed()); }
-    Value *data() const { return static_cast<MemberData *>(managed())->data; }
+    Value *data() const { return static_cast<MemberData *>(managed())->d()->data; }
 
     void mark(ExecutionEngine *e) const {
         MemberData *m = d();