memset(allocCount, 0, sizeof(allocCount));
scribble = !qgetenv("QV4_MM_SCRIBBLE").isEmpty();
aggressiveGC = !qgetenv("QV4_MM_AGGRESSIVE_GC").isEmpty();
- exactGC = !qgetenv("QV4_MM_EXACT_GC").isEmpty();
+ exactGC = qgetenv("QV4_MM_CONSERVATIVE_GC").isEmpty();
}
~Data()
persistent = persistent->next;
}
- // push all caller saved registers to the stack, so we can find the objects living in these registers
+ collectFromJSStack();
+
+ if (!m_d->exactGC) {
+ // push all caller saved registers to the stack, so we can find the objects living in these registers
#if COMPILER(MSVC)
# if CPU(X86_64)
- HANDLE thread = GetCurrentThread();
- WOW64_CONTEXT ctxt;
- /*bool success =*/ Wow64GetThreadContext(thread, &ctxt);
+ HANDLE thread = GetCurrentThread();
+ WOW64_CONTEXT ctxt;
+ /*bool success =*/ Wow64GetThreadContext(thread, &ctxt);
# elif CPU(X86)
- HANDLE thread = GetCurrentThread();
- CONTEXT ctxt;
- /*bool success =*/ GetThreadContext(thread, &ctxt);
+ HANDLE thread = GetCurrentThread();
+ CONTEXT ctxt;
+ /*bool success =*/ GetThreadContext(thread, &ctxt);
# endif // CPU
#elif COMPILER(CLANG) || COMPILER(GCC)
# if CPU(X86_64)
- quintptr regs[5];
- asm(
- "mov %%rbp, %0\n"
- "mov %%r12, %1\n"
- "mov %%r13, %2\n"
- "mov %%r14, %3\n"
- "mov %%r15, %4\n"
- : "=m" (regs[0]), "=m" (regs[1]), "=m" (regs[2]), "=m" (regs[3]), "=m" (regs[4])
- :
- :
- );
+ quintptr regs[5];
+ asm(
+ "mov %%rbp, %0\n"
+ "mov %%r12, %1\n"
+ "mov %%r13, %2\n"
+ "mov %%r14, %3\n"
+ "mov %%r15, %4\n"
+ : "=m" (regs[0]), "=m" (regs[1]), "=m" (regs[2]), "=m" (regs[3]), "=m" (regs[4])
+ :
+ :
+ );
# endif // CPU
#endif // COMPILER
- collectFromJSStack();
-
- if (!m_d->exactGC)
collectFromStack();
+ }
// Preserve QObject ownership rules within JavaScript: A parent with c++ ownership
// keeps all of its children alive in JavaScript.
Q_DECLARE_METATYPE(QList<int>)
Q_DECLARE_METATYPE(QObjectList)
-// The JavaScriptCore GC marks the C stack. To try to ensure that there is
-// no JSObject* left in stack memory by the compiler, we call this function
-// to zap some bytes of memory before calling collectGarbage().
-static void NO_INLINE zapSomeStack()
-{
- char *buf = (char*)alloca(4096);
- memset(buf, 0, 4096);
-}
-
-static void collectGarbage_helper(QJSEngine &eng)
-{
- zapSomeStack();
- eng.collectGarbage();
-}
-
class tst_QJSEngine : public QObject
{
Q_OBJECT
void tst_QJSEngine::newQObject_ownership()
{
- QSKIP("unreliable test due to our conservative GC");
QJSEngine eng;
{
QPointer<QObject> ptr = new QObject();
{
QJSValue v = eng.newQObject(ptr);
}
- collectGarbage_helper(eng);
+ eng.collectGarbage();
if (ptr)
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
QVERIFY(ptr == 0);
QJSValue v = eng.newQObject(ptr);
}
QObject *before = ptr;
- collectGarbage_helper(eng);
+ eng.collectGarbage();
QVERIFY(ptr == before);
delete ptr;
}
{
QJSValue v = eng.newQObject(ptr);
}
- collectGarbage_helper(eng);
+ eng.collectGarbage();
// no parent, so it should be like ScriptOwnership
if (ptr)
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
{
QJSValue v = eng.newQObject(child);
}
- collectGarbage_helper(eng);
+ eng.collectGarbage();
// has parent, so it should be like QtOwnership
QVERIFY(child != 0);
delete parent;
void tst_QJSEngine::collectGarbage()
{
- QSKIP("This test is not reliable due to our conservative GC");
QJSEngine eng;
eng.evaluate("a = new Object(); a = new Object(); a = new Object()");
QJSValue a = eng.newObject();
QPointer<QObject> ptr = new QObject();
QVERIFY(ptr != 0);
(void)eng.newQObject(ptr);
- collectGarbage_helper(eng);
+ eng.collectGarbage();
if (ptr)
QGuiApplication::sendPostedEvents(ptr, QEvent::DeferredDelete);
QVERIFY(ptr == 0);
}
};
-// The JavaScriptCore GC marks the C stack. To try to ensure that there is
-// no JSObject* left in stack memory by the compiler, we call this function
-// to zap some bytes of memory before calling collectGarbage().
-static void zapSomeStack()
-{
- char *buf = (char*)alloca(4096);
- memset(buf, 0, 4096);
-}
-
static void gc(QQmlEngine &engine)
{
- zapSomeStack();
engine.collectGarbage();
QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
QCoreApplication::processEvents();
}
};
-// The JavaScriptCore GC marks the C stack. To try to ensure that there is
-// no JSObject* left in stack memory by the compiler, we call this function
-// to zap some bytes of memory before calling collectGarbage().
-static void NO_INLINE zapSomeStack()
-{
- char *buf = (char*)alloca(4096);
- memset(buf, 0, 4096);
-}
-
-static void gcWithoutDeferredObjectDeletion(QQmlEngine &engine)
-{
- zapSomeStack();
- engine.collectGarbage();
-}
-
static void gc(QQmlEngine &engine)
{
- gcWithoutDeferredObjectDeletion(engine);
+ engine.collectGarbage();
QCoreApplication::sendPostedEvents(0, QEvent::DeferredDelete);
QCoreApplication::processEvents();
}
QObject *object = component.create();
QVERIFY(object != 0);
QMetaObject::invokeMethod(object, "createComponent");
- gcWithoutDeferredObjectDeletion(engine);
+ engine.collectGarbage();
QMetaObject::invokeMethod(object, "runTest");
QCOMPARE(object->property("test").toBool(), true);
delete object;
delete object;
}
-#if defined(Q_CC_GNU)
-#if (__GNUC__ * 100 + __GNUC_MINOR__) >= 404
-#define pop_gcc_flags
-#pragma GCC push_options
-#pragma GCC optimize ("O0")
-#endif
-#endif
-
void tst_qqmlecmascript::propertyVarInheritance()
{
- QSKIP("This test does not work reliably with our conservative GC.");
-
// enforce behaviour regarding element inheritance - ensure handle disposal.
// The particular component under test here has a chain of references.
QQmlComponent component(&engine, testFileUrl("propertyVar.inherit.qml"));
// ensure that there are only weak handles to the underlying varProperties array remaining.
gc(engine);
// an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail.
-#if defined(Q_CC_MSVC)
- QSKIP("This test does not work reliably with MSVC.");
-#endif
-#if !defined(Q_CC_CLANG)
QVERIFY(icoCanaryHandle.isUndefined());
QVERIFY(ccoCanaryHandle.isUndefined());
-#endif
delete object;
// since there are no parent vmemo's to keep implicit references alive, and the only handles
// to what remains are weak, all varProperties arrays must have been collected.
void tst_qqmlecmascript::propertyVarInheritance2()
{
- QSKIP("This test does not work reliably with our conservative GC.");
-
// The particular component under test here does NOT have a chain of references; the
// only link between rootObject and childObject is that rootObject is the parent of childObject.
QQmlComponent component(&engine, testFileUrl("propertyVar.circular.2.qml"));
QMetaObject::invokeMethod(object, "deassignCircular");
gc(engine);
// an equivalent for pragma GCC optimize is still work-in-progress for CLang, so this test will fail.
-#if !defined(Q_CC_CLANG)
QVERIFY(childObjectVarArrayValueHandle.isUndefined()); // should have been collected now.
-#endif
delete object;
}
-#if defined(pop_gcc_flags)
-#pragma GCC pop_options
-#endif
-
// Ensure that QObject type conversion works on binding assignment
void tst_qqmlecmascript::elementAssign()
projects / platform / upstream / qtdeclarative.git / commitdiff