Save memory on array data

Store a simple vector of Values in the array data,
instead of a Vector of Property's. This halfes the
memory consumption on 64bit and simplifies our code.

If an indexed property gets converted to an accessor
property, we simply convert the ArrayData into a
SparseArrayData.

Add support in SparseArrayData to allocate double slots
(two Value's) to hold a full Property in case someone
sets an accessor on an indexed property.

Some methods still return a Property*, but this is safe, as
only the first Value in the Property pointer will ever get
accessed if the Property doesn't contain an accessor.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/src/qml/jsruntime/qv4runtime.cpp b/src/qml/jsruntime/qv4runtime.cpp
index 4c7ec6602d..a8b453309d 100644
--- a/src/qml/jsruntime/qv4runtime.cpp
+++ b/src/qml/jsruntime/qv4runtime.cpp
@@ -1120,8 +1120,8 @@ void __qmljs_builtin_define_getter_setter(ExecutionContext *ctx, const ValueRef
 
     uint idx = name->asArrayIndex();
     Property pd;
-    pd.setGetter(getter ? getter->asFunctionObject() : 0);
-    pd.setSetter(setter ? setter->asFunctionObject() : 0);
+    pd.value = getter;
+    pd.set = setter;
     if (idx != UINT_MAX) {
         o->arraySet(idx, pd, Attr_Accessor);
     } else {
@@ -1139,9 +1139,9 @@ ReturnedValue __qmljs_builtin_define_object_literal(QV4::ExecutionContext *ctx,
         if (klass->propertyData[i].isData())
             o->memberData[i].value = *args++;
         else {
-            o->memberData[i].setGetter(args->asFunctionObject());
+            o->memberData[i].value = *args;
             args++;
-            o->memberData[i].setSetter(args->asFunctionObject());
+            o->memberData[i].set = *args;
             args++;
         }
     }