summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@theqtcompany.com>2015-12-23 18:26:50 +0100
committerSimon Hausmann <simon.hausmann@theqtcompany.com>2015-12-23 18:19:57 +0000
commit9c4621217f47b8427e284423d4e5c5e4dba00bfc (patch)
tree50c2cc2fddfdb1c6c5432fa1a8aeae3251a0d7e3
parent7842c2c19c16e6d52d1b138fb33ee563bae0faae (diff)
Revert "Fix QtSharedPointer::ExternalRefCountData object leaks"
This reverts commit 839d2d3e2368bc8e107d22203b0611c852f54319, which has been causing crashes in qtquickcontrols2 auto tests and making it nearly impossible to integrate anything over the past few days. Change-Id: I570b286a067aae5e3c2d8c56ad601e1a6cb58c20 Task-number: QTBUG-50134 Reviewed-by: Simon Hausmann <simon.hausmann@theqtcompany.com>
-rw-r--r--src/qml/jsruntime/qv4persistent.cpp7
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper.cpp5
-rw-r--r--src/qml/jsruntime/qv4qobjectwrapper_p.h1
-rw-r--r--src/qml/memory/qv4mm.cpp11
-rw-r--r--src/qml/memory/qv4mm_p.h2
-rw-r--r--src/qml/types/qqmllistmodel.cpp3
6 files changed, 2 insertions, 27 deletions
diff --git a/src/qml/jsruntime/qv4persistent.cpp b/src/qml/jsruntime/qv4persistent.cpp
index 032ad0d00a..4a0f84b685 100644
--- a/src/qml/jsruntime/qv4persistent.cpp
+++ b/src/qml/jsruntime/qv4persistent.cpp
@@ -34,7 +34,6 @@
#include "qv4persistent_p.h"
#include <private/qv4mm_p.h>
#include "qv4object_p.h"
-#include "qv4qobjectwrapper_p.h"
#include "PageAllocation.h"
using namespace QV4;
@@ -205,12 +204,6 @@ void PersistentValueStorage::free(Value *v)
Page *p = getPage(v);
- // Keep track of QObjectWrapper to release its resources later in MemoryManager::sweep()
- if (p->header.engine) {
- if (QObjectWrapper *qobjectWrapper = v->as<QObjectWrapper>())
- p->header.engine->memoryManager->m_pendingDestroyedObjectWrappers.push_back(qobjectWrapper->d());
- }
-
v->setTag(QV4::Value::Empty_Type);
v->setInt_32(p->header.freeList);
p->header.freeList = v - p->values;
diff --git a/src/qml/jsruntime/qv4qobjectwrapper.cpp b/src/qml/jsruntime/qv4qobjectwrapper.cpp
index 2cb8991055..8f471132b7 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper.cpp
+++ b/src/qml/jsruntime/qv4qobjectwrapper.cpp
@@ -1019,11 +1019,6 @@ void QObjectWrapper::markObjects(Heap::Base *that, QV4::ExecutionEngine *e)
void QObjectWrapper::destroyObject(bool lastCall)
{
Heap::QObjectWrapper *h = d();
- destroyObject(h, lastCall);
-}
-
-void QObjectWrapper::destroyObject(Heap::QObjectWrapper *h, bool lastCall)
-{
if (!h->internalClass)
return; // destroyObject already got called
diff --git a/src/qml/jsruntime/qv4qobjectwrapper_p.h b/src/qml/jsruntime/qv4qobjectwrapper_p.h
index 29e1263f2d..1126013806 100644
--- a/src/qml/jsruntime/qv4qobjectwrapper_p.h
+++ b/src/qml/jsruntime/qv4qobjectwrapper_p.h
@@ -120,7 +120,6 @@ struct Q_QML_EXPORT QObjectWrapper : public Object
void setProperty(ExecutionEngine *engine, int propertyIndex, const Value &value);
void destroyObject(bool lastCall);
- static void destroyObject(Heap::QObjectWrapper *h, bool lastCall);
protected:
static bool isEqualTo(Managed *that, Managed *o);
diff --git a/src/qml/memory/qv4mm.cpp b/src/qml/memory/qv4mm.cpp
index 053dfb856c..5181bf912b 100644
--- a/src/qml/memory/qv4mm.cpp
+++ b/src/qml/memory/qv4mm.cpp
@@ -41,6 +41,8 @@
#include "StdLibExtras.h"
#include <QTime>
+#include <QVector>
+#include <QVector>
#include <QMap>
#include <iostream>
@@ -435,15 +437,6 @@ void MemoryManager::sweep(bool lastSweep)
(*it) = Primitive::undefinedValue();
}
- // Some QV4::QObjectWrapper objects will be removed from PersistentValueStorage in WeakValue::~WeakValue()
- // before MemoryManager::sweep() is being called, in this case we will never have a chance to call detroyObject()
- // on those QV4::QObjectWrapper objects. Here we call detroyObject() for each pending destroyed Heap::QObjectWrapper
- // object on the heap to make sure that we can release all the resources held by them
- for (QVector<Heap::QObjectWrapper *>::const_iterator it = m_pendingDestroyedObjectWrappers.constBegin();
- it != m_pendingDestroyedObjectWrappers.constEnd(); ++it)
- QObjectWrapper::destroyObject(*it, lastSweep);
- m_pendingDestroyedObjectWrappers.clear();
-
if (MultiplyWrappedQObjectMap *multiplyWrappedQObjects = engine->m_multiplyWrappedQObjects) {
for (MultiplyWrappedQObjectMap::Iterator it = multiplyWrappedQObjects->begin(); it != multiplyWrappedQObjects->end();) {
if (!it.value().isNullOrUndefined())
diff --git a/src/qml/memory/qv4mm_p.h b/src/qml/memory/qv4mm_p.h
index 69aae1c5bf..3543da0907 100644
--- a/src/qml/memory/qv4mm_p.h
+++ b/src/qml/memory/qv4mm_p.h
@@ -49,7 +49,6 @@
#include <private/qv4value_p.h>
#include <private/qv4scopedvalue_p.h>
#include <private/qv4object_p.h>
-#include <QVector>
//#define DETAILED_MM_STATS
@@ -328,7 +327,6 @@ public:
QScopedPointer<Data> m_d;
PersistentValueStorage *m_persistentValues;
PersistentValueStorage *m_weakValues;
- QVector<Heap::QObjectWrapper *> m_pendingDestroyedObjectWrappers;
};
}
diff --git a/src/qml/types/qqmllistmodel.cpp b/src/qml/types/qqmllistmodel.cpp
index 4b0aa47c63..a4c0f7043f 100644
--- a/src/qml/types/qqmllistmodel.cpp
+++ b/src/qml/types/qqmllistmodel.cpp
@@ -2277,9 +2277,6 @@ QQmlV4Handle QQmlListModel::get(int index) const
} else {
QObject *object = m_listModel->getOrCreateModelObject(const_cast<QQmlListModel *>(this), index);
result = scope.engine->memoryManager->allocObject<QV4::ModelObject>(object, const_cast<QQmlListModel *>(this), index);
- // Keep track of the QObjectWrapper in persistent value storage
- QV4::Value *val = scope.engine->memoryManager->m_weakValues->allocate();
- *val = result;
}
}