Refactor how we define Heap objects

Declare the type of Heap object in the Member() macro, instead of
deducing it from templates. This allows us to encode the offset
of the member in the second template argument to Pointer<> in
a second step.

Change-Id: I2cfb73785749d3fb991689b4e0554a72b3e5e13f
Reviewed-by: Simon Hausmann <[email protected]>

1 files changed, 5 insertions, 5 deletions

diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h
index 083ff4343b..1fc40e6ff6 100644
--- a/src/qml/jsruntime/qv4functionobject_p.h
+++ b/src/qml/jsruntime/qv4functionobject_p.h
@@ -66,8 +66,8 @@ struct BuiltinFunction;
 namespace Heap {
 
 #define FunctionObjectMembers(class, Member) \
-    Member(class, Pointer<ExecutionContext>, scope) \
-    Member(class, Function *, function)
+    Member(class, Pointer, ExecutionContext *, scope) \
+    Member(class, NoMark, Function *, function)
 
 DECLARE_HEAP_OBJECT(FunctionObject, Object) {
     DECLARE_MARK_TABLE(FunctionObject);
@@ -122,9 +122,9 @@ struct ScriptFunction : FunctionObject {
 };
 
 #define BoundFunctionMembers(class, Member) \
-    Member(class, Pointer<FunctionObject>, target) \
-    Member(class, Value, boundThis) \
-    Member(class, Pointer<MemberData>, boundArgs)
+    Member(class, Pointer, FunctionObject *, target) \
+    Member(class, Value, Value, boundThis) \
+    Member(class, Pointer, MemberData *, boundArgs)
 
 DECLARE_HEAP_OBJECT(BoundFunction, FunctionObject) {
     DECLARE_MARK_TABLE(BoundFunction);