From 4427576fe548b6f9f8acba6a5ac3082fbbb99724 Mon Sep 17 00:00:00 2001 From: Lars Knoll Date: Thu, 3 Apr 2014 13:00:49 +0200 Subject: Avoid calling destroy() on most objects The method is now optional, and we can simply avoid calling it if all members an object has are themselves garbage collected. Change-Id: If560fce051908bcc10409ead1a7d8a5bd5fa71d2 Reviewed-by: Simon Hausmann --- src/qml/jsruntime/qv4arraydata.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'src/qml/jsruntime/qv4arraydata.cpp') diff --git a/src/qml/jsruntime/qv4arraydata.cpp b/src/qml/jsruntime/qv4arraydata.cpp index ed2122fb89..0bc97cd571 100644 --- a/src/qml/jsruntime/qv4arraydata.cpp +++ b/src/qml/jsruntime/qv4arraydata.cpp @@ -47,7 +47,7 @@ using namespace QV4; const ArrayVTable SimpleArrayData::static_vtbl = { - DEFINE_MANAGED_VTABLE_INT(SimpleArrayData), + DEFINE_MANAGED_VTABLE_NO_DESTROY_INT(SimpleArrayData), SimpleArrayData::Simple, SimpleArrayData::reallocate, SimpleArrayData::get, @@ -207,10 +207,6 @@ void ArrayData::ensureAttributes(Object *o) } -void SimpleArrayData::destroy(Managed *) -{ -} - void SimpleArrayData::markObjects(Managed *d, ExecutionEngine *e) { SimpleArrayData *dd = static_cast(d); -- cgit v1.2.3