diff options
author | Lars Knoll <lars.knoll@qt.io> | 2018-01-05 15:30:23 +0100 |
---|---|---|
committer | Lars Knoll <lars.knoll@qt.io> | 2018-04-12 13:59:08 +0000 |
commit | 6002b48c3c5edc509c269c801fc8a088d5065ce8 (patch) | |
tree | a8fc764de87bfbd5f201930dcec1c7459502eb7e /src/qml/jsruntime/qv4lookup.cpp | |
parent | 3932536b59df7b2fa010be6dd9f2501f6e306c8b (diff) |
garbage collect InternalClass
Internal classes are now allocated and collected through
the GC. As they are important to the deletion of other
objects (because of the vtable pointer living inside the
internal class), they need to get destroyed after regular
objects have been sweeped. Achieve this by using a separate
block allocator for internal class objects.
Our lookups do often contain pointers to internal classes,
so those need to be marked as well, so we don't accidentally
collect them.
Change-Id: I4762b054361c70c31f79f920f669ea0e8551601f
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'src/qml/jsruntime/qv4lookup.cpp')
-rw-r--r-- | src/qml/jsruntime/qv4lookup.cpp | 52 |
1 files changed, 50 insertions, 2 deletions
diff --git a/src/qml/jsruntime/qv4lookup.cpp b/src/qml/jsruntime/qv4lookup.cpp index 52ab03cd94..b93b314b63 100644 --- a/src/qml/jsruntime/qv4lookup.cpp +++ b/src/qml/jsruntime/qv4lookup.cpp @@ -347,7 +347,6 @@ ReturnedValue Lookup::getterProtoAccessor(Lookup *l, ExecutionEngine *engine, co return static_cast<const FunctionObject *>(getter)->call(&object, nullptr, 0); } - l->getter = getterTwoClasses; return getterTwoClasses(l, engine, object); } @@ -442,7 +441,7 @@ bool Lookup::resolveSetter(ExecutionEngine *engine, Object *object, const Value Scope scope(engine); ScopedString name(scope, scope.engine->currentStackFrame->v4Function->compilationUnit->runtimeStrings[nameIndex]); - InternalClass *c = object->internalClass(); + Heap::InternalClass *c = object->internalClass(); uint idx = c->find(name); if (idx != UINT_MAX) { if (object->isArrayObject() && idx == Heap::ArrayObject::LengthPropertyIndex) { @@ -599,4 +598,53 @@ bool Lookup::arrayLengthSetter(Lookup *, ExecutionEngine *engine, Value &object, return true; } +void Lookup::markObjects(MarkStack *stack) +{ + if (getter == getterGeneric || + getter == getterTwoClasses || + getter == getterFallback) { + ; + } else if (getter == getter0MemberData || + getter == getter0Inline || + getter == getterAccessor) { + objectLookup.ic->mark(stack); + } else if (getter == getterProto) { + ; + } else if (getter == getter0Inlinegetter0Inline || + getter == getter0Inlinegetter0MemberData || + getter == getter0MemberDatagetter0MemberData) { + objectLookupTwoClasses.ic->mark(stack); + objectLookupTwoClasses.ic2->mark(stack); + } else if (getter == getterProtoTwoClasses || + getter == getterProtoAccessor || + getter == getterProtoAccessorTwoClasses) { + + } else if (getter == primitiveGetterProto || + getter == primitiveGetterAccessor) { + primitiveLookup.proto->mark(stack); + } else if (getter == stringLengthGetter) { + ; + + } else if (globalGetter == globalGetterGeneric || + globalGetter == globalGetterProto || + globalGetter == globalGetterProtoAccessor) { + ; + + } else if (setter == setterGeneric || + setter == setterTwoClasses || + setter == setterFallback) { + ; + } else if (setter == setter0 || + setter == setter0Inline) { + objectLookup.ic->mark(stack); + } else if (setter == setter0setter0) { + objectLookupTwoClasses.ic->mark(stack); + objectLookupTwoClasses.ic2->mark(stack); + } else if (setter == setterInsert) { + insertionLookup.newClass->mark(stack); + } else if (setter == arrayLengthSetter) { + ; + } +} + QT_END_NAMESPACE |