Let markObjects() operate directly on HeapObjects

This decouples things a bit better and helps moving
over to directly store heapobject pointers in other
objects.

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

1 files changed, 9 insertions, 9 deletions

diff --git a/src/qml/jsruntime/qv4functionobject.cpp b/src/qml/jsruntime/qv4functionobject.cpp
index 417aaff756..deb9e62591 100644
--- a/src/qml/jsruntime/qv4functionobject.cpp
+++ b/src/qml/jsruntime/qv4functionobject.cpp
@@ -152,11 +152,11 @@ ReturnedValue FunctionObject::call(Managed *, CallData *)
     return Encode::undefined();
 }
 
-void FunctionObject::markObjects(Managed *that, ExecutionEngine *e)
+void FunctionObject::markObjects(HeapObject *that, ExecutionEngine *e)
 {
-    FunctionObject *o = static_cast<FunctionObject *>(that);
-    if (o->scope())
-        o->scope()->mark(e);
+    FunctionObject::Data *o = static_cast<FunctionObject::Data *>(that);
+    if (o->scope)
+        o->scope->mark(e);
 
     Object::markObjects(that, e);
 }
@@ -637,11 +637,11 @@ ReturnedValue BoundFunction::construct(Managed *that, CallData *dd)
     return f->target()->construct(callData);
 }
 
-void BoundFunction::markObjects(Managed *that, ExecutionEngine *e)
+void BoundFunction::markObjects(HeapObject *that, ExecutionEngine *e)
 {
-    BoundFunction *o = static_cast<BoundFunction *>(that);
-    o->target()->mark(e);
-    o->boundThis().mark(e);
-    o->boundArgs().mark(e);
+    BoundFunction::Data *o = static_cast<BoundFunction::Data *>(that);
+    o->target->mark(e);
+    o->boundThis.mark(e);
+    o->boundArgs.mark(e);
     FunctionObject::markObjects(that, e);
 }