diff options
author | Lars Knoll <lars.knoll@digia.com> | 2014-04-05 20:23:20 +0200 |
---|---|---|
committer | Simon Hausmann <simon.hausmann@digia.com> | 2014-07-22 13:48:54 +0200 |
commit | b11ec085703a0b019c8115ff505ee6e2553fd4f1 (patch) | |
tree | 3336b31ba690f9b200b7fee8cc133aa4bf2e7837 /src/qml/jsruntime/qv4argumentsobject.cpp | |
parent | 05f17e841f971d3c8f635cc044c60c970c2055c9 (diff) |
Move Managed data into it's own subclass
This prepares for moving over to a d pointer scheme,
where Managed subclasses don't hold any data directly. This
is required to be able to move over to a modern GC.
Change-Id: I3f59633ac07a7da461bd2d4f0f9f3a8e3b0baf02
Reviewed-by: Simon Hausmann <simon.hausmann@digia.com>
Diffstat (limited to 'src/qml/jsruntime/qv4argumentsobject.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4argumentsobject.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/qml/jsruntime/qv4argumentsobject.cpp b/src/qml/jsruntime/qv4argumentsobject.cpp index 91945875a1..7d4df899a6 100644 --- a/src/qml/jsruntime/qv4argumentsobject.cpp +++ b/src/qml/jsruntime/qv4argumentsobject.cpp @@ -58,8 +58,8 @@ ArgumentsObject::ArgumentsObject(CallContext *context) setArrayType(ArrayData::Complex); if (context->strictMode) { - Q_ASSERT(CalleePropertyIndex == internalClass->find(context->engine->id_callee)); - Q_ASSERT(CallerPropertyIndex == internalClass->find(context->engine->id_caller)); + Q_ASSERT(CalleePropertyIndex == internalClass()->find(context->engine->id_callee)); + Q_ASSERT(CallerPropertyIndex == internalClass()->find(context->engine->id_caller)); propertyAt(CalleePropertyIndex)->value = v4->thrower; propertyAt(CalleePropertyIndex)->set = v4->thrower; propertyAt(CallerPropertyIndex)->value = v4->thrower; @@ -69,14 +69,14 @@ ArgumentsObject::ArgumentsObject(CallContext *context) arrayPut(0, context->callData->args, context->callData->argc); fullyCreated = true; } else { - hasAccessorProperty = 1; - Q_ASSERT(CalleePropertyIndex == internalClass->find(context->engine->id_callee)); + setHasAccessorProperty(); + Q_ASSERT(CalleePropertyIndex == internalClass()->find(context->engine->id_callee)); memberData[CalleePropertyIndex] = context->function->asReturnedValue(); } - Q_ASSERT(LengthPropertyIndex == internalClass->find(context->engine->id_length)); + Q_ASSERT(LengthPropertyIndex == internalClass()->find(context->engine->id_length)); memberData[LengthPropertyIndex] = Primitive::fromInt32(context->realArgumentCount); - Q_ASSERT(internalClass->vtable == staticVTable()); + Q_ASSERT(internalClass()->vtable == staticVTable()); } void ArgumentsObject::fullyCreate() |