From 943583ca408f5d419de03e54aab48557f5e5bebb Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Fri, 7 Nov 2014 18:10:30 +0100 Subject: Store all data members in FunctionObject as heap data Change-Id: Ic061baaf7f5ff08c5e6e7130abd6a650148d3d2d Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4functionobject_p.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/qml/jsruntime/qv4functionobject_p.h') diff --git a/src/qml/jsruntime/qv4functionobject_p.h b/src/qml/jsruntime/qv4functionobject_p.h index 288777f8eb..7cbdccb8fd 100644 --- a/src/qml/jsruntime/qv4functionobject_p.h +++ b/src/qml/jsruntime/qv4functionobject_p.h @@ -60,13 +60,14 @@ struct Q_QML_PRIVATE_EXPORT FunctionObject : Object { FunctionObject(QV4::ExecutionContext *scope, QV4::String *name, bool createProto = false); FunctionObject(QV4::ExecutionContext *scope, const QString &name = QString(), bool createProto = false); FunctionObject(QV4::ExecutionContext *scope, const ReturnedValue name); + FunctionObject(ExecutionContext *scope, const ReturnedValue name); FunctionObject(InternalClass *ic); ~FunctionObject(); unsigned int formalParameterCount() { return function ? function->compiledFunction->nFormals : 0; } unsigned int varCount() { return function ? function->compiledFunction->nLocals : 0; } - QV4::ExecutionContext *scope; + ExecutionContext *scope; Function *function; }; @@ -99,7 +100,7 @@ struct ScriptFunction : SimpleScriptFunction { struct BoundFunction : FunctionObject { BoundFunction(QV4::ExecutionContext *scope, QV4::FunctionObject *target, const ValueRef boundThis, QV4::MemberData *boundArgs); - QV4::FunctionObject *target; + FunctionObject *target; Value boundThis; MemberData *boundArgs; }; @@ -113,7 +114,7 @@ struct Q_QML_EXPORT FunctionObject: Object { V4_OBJECT2(FunctionObject, Object) Q_MANAGED_TYPE(FunctionObject) - ExecutionContext *scope() { return d()->scope; } + Heap::ExecutionContext *scope() { return d()->scope; } Function *function() { return d()->function; } ReturnedValue name(); @@ -231,10 +232,9 @@ struct BoundFunction: FunctionObject { return scope->engine()->memoryManager->alloc(scope, target, boundThis, boundArgs); } - FunctionObject *target() { return d()->target; } + Heap::FunctionObject *target() { return d()->target; } Value boundThis() const { return d()->boundThis; } - // ### GC - MemberData::Data *boundArgs() const { return d()->boundArgs; } + Heap::MemberData *boundArgs() const { return d()->boundArgs; } static ReturnedValue construct(Managed *, CallData *d); static ReturnedValue call(Managed *that, CallData *dd); -- cgit v1.2.3