destruct qobject wrappers before sweeping the GC heap

The wrappers emit a destroyed signal, and it's important
that the GC heap is in a well defined state when these signals
are emitted.

Change-Id: I423c4241b1e2fd3de727277d26bbe64f08862193
Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>

1 files changed, 23 insertions, 40 deletions

diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 5dc1cfef10..31abab2e2f 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1037,48 +1037,31 @@ void QObjectWrapper::markObjects(Heap::Base *that, QV4::ExecutionEngine *e)
     QV4::Object::markObjects(that, e);
 }
 
-namespace {
-    struct QObjectDeleter : public QV4::GCDeletable
-    {
-        QObjectDeleter(QObject *o)
-            : m_objectToDelete(o)
-        {}
-        ~QObjectDeleter()
-        {
-            QQmlData *ddata = QQmlData::get(m_objectToDelete, false);
-            if (ddata && ddata->ownContext && ddata->context)
-                ddata->context->emitDestruction();
-            // This object is notionally destroyed now
-            ddata->isQueuedForDeletion = true;
-            if (lastCall)
-                delete m_objectToDelete;
-            else
-                m_objectToDelete->deleteLater();
-        }
-
-        QObject *m_objectToDelete;
-    };
-}
-
-void QObjectWrapper::destroy(Heap::Base *that)
+void QObjectWrapper::destroyObject(bool lastCall)
 {
-    Heap::QObjectWrapper *This = static_cast<Heap::QObjectWrapper*>(that);
-    QPointer<QObject> object = This->object;
-    ExecutionEngine *engine = This->internalClass->engine;
-    This->~Data();
-    This = 0;
-    if (!object)
-        return;
-
-    QQmlData *ddata = QQmlData::get(object, false);
-    if (!ddata)
-        return;
-
-    if (object->parent() || ddata->indestructible)
-        return;
+    Heap::QObjectWrapper *h = d();
+    if (!h->internalClass)
+        return; // destroyObject already got called
+
+    QPointer<QObject> object = h->object;
+    if (object) {
+        QQmlData *ddata = QQmlData::get(object, false);
+        if (ddata) {
+            if (!object->parent() && !ddata->indestructible) {
+                if (ddata && ddata->ownContext && ddata->context)
+                    ddata->context->emitDestruction();
+                // This object is notionally destroyed now
+                ddata->isQueuedForDeletion = true;
+                if (lastCall)
+                    delete object;
+                else
+                    object->deleteLater();
+            }
+        }
+    }
 
-    QObjectDeleter *deleter = new QObjectDeleter(object);
-    engine->memoryManager->registerDeletable(deleter);
+    h->internalClass = 0;
+    h->~Data();
 }