New mark table implementation

Automatically generate a table containing the data where JS Values
and pointers are in objects in the JS heap.

This will allow making the GC mark phase a lot more efficient.

A bit of a special hack is currently required for MemberData and
ArrayData, as they have a variable length, and we need to read the
size from the object.

We keep backwards compatibility with the old markObjects() functions
for now (calling them if they are defined). Some further work on
QV4::String and in a few other places is required before we can get
remove the compatibility.

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

1 files changed, 17 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4argumentsobject_p.h b/src/qml/jsruntime/qv4argumentsobject_p.h
index f80ade9611..f579afff14 100644
--- a/src/qml/jsruntime/qv4argumentsobject_p.h
+++ b/src/qml/jsruntime/qv4argumentsobject_p.h
@@ -59,26 +59,35 @@ namespace QV4 {
 
 namespace Heap {
 
-struct ArgumentsGetterFunction : FunctionObject {
+#define ArgumentsGetterFunctionMembers(class, Member) \
+    Member(class, uint, index)
+
+DECLARE_HEAP_OBJECT(ArgumentsGetterFunction, FunctionObject) {
+    DECLARE_MARK_TABLE(ArgumentsGetterFunction);
     inline void init(QV4::ExecutionContext *scope, uint index);
-    uint index;
 };
 
-struct ArgumentsSetterFunction : FunctionObject {
+#define ArgumentsSetterFunctionMembers(class, Member) \
+    Member(class, uint, index)
+
+DECLARE_HEAP_OBJECT(ArgumentsSetterFunction, FunctionObject) {
+    DECLARE_MARK_TABLE(ArgumentsSetterFunction);
     inline void init(QV4::ExecutionContext *scope, uint index);
-    uint index;
 };
 
-struct ArgumentsObject : Object {
+#define ArgumentsObjectMembers(class, Member) \
+    Member(class, Pointer<CallContext>, context) \
+    Member(class, Pointer<MemberData>, mappedArguments) \
+    Member(class, bool, fullyCreated)
+
+DECLARE_HEAP_OBJECT(ArgumentsObject, Object) {
+    DECLARE_MARK_TABLE(ArgumentsObject);
     enum {
         LengthPropertyIndex = 0,
         CalleePropertyIndex = 1,
         CallerPropertyIndex = 3
     };
     void init(QV4::CallContext *context);
-    Pointer<CallContext> context;
-    bool fullyCreated;
-    Pointer<MemberData> mappedArguments;
 };
 
 }
@@ -131,7 +140,6 @@ struct ArgumentsObject: Object {
     static bool putIndexed(Managed *m, uint index, const Value &value);
     static bool deleteIndexedProperty(Managed *m, uint index);
     static PropertyAttributes queryIndexed(const Managed *m, uint index);
-    static void markObjects(Heap::Base *that, ExecutionEngine *e);
     static uint getLength(const Managed *m);
 
     void fullyCreate();