From 878b11e0a94e892c0377bca01b49706c150926ed Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Sat, 1 Nov 2014 20:56:47 +0100 Subject: 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 --- src/qml/jsruntime/qv4regexpobject.cpp | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'src/qml/jsruntime/qv4regexpobject.cpp') diff --git a/src/qml/jsruntime/qv4regexpobject.cpp b/src/qml/jsruntime/qv4regexpobject.cpp index b16a6bd875..23b46c8492 100644 --- a/src/qml/jsruntime/qv4regexpobject.cpp +++ b/src/qml/jsruntime/qv4regexpobject.cpp @@ -170,11 +170,11 @@ void RegExpObject::init(ExecutionEngine *engine) } -void RegExpObject::markObjects(Managed *that, ExecutionEngine *e) +void RegExpObject::markObjects(HeapObject *that, ExecutionEngine *e) { - RegExpObject *re = static_cast(that); - if (re->value()) - re->value()->mark(e); + RegExpObject::Data *re = static_cast(that); + if (re->value) + re->value->mark(e); Object::markObjects(that, e); } @@ -303,11 +303,11 @@ ReturnedValue RegExpCtor::call(Managed *that, CallData *callData) return construct(that, callData); } -void RegExpCtor::markObjects(Managed *that, ExecutionEngine *e) +void RegExpCtor::markObjects(HeapObject *that, ExecutionEngine *e) { - RegExpCtor *This = static_cast(that); - This->lastMatch().mark(e); - This->lastInput().mark(e); + RegExpCtor::Data *This = static_cast(that); + This->lastMatch.mark(e); + This->lastInput.mark(e); FunctionObject::markObjects(that, e); } -- cgit v1.2.3