wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Use reserve double pool when running into OOM in LeaveTrace (523947, r=dvander).

Browse Source
This commit is contained in:
Andreas Gal 2009-10-28 15:32:40 -07:00
parent 5191f92b48
commit 0587fde91b
2 changed files with 28 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
js/src/jsgc.cpp
View File

@ -1509,9 +1509,17 @@ NewFinalizableGCThing(JSContext *cx, unsigned thingKind)
break;
}
#if defined JS_GC_ZEAL && defined JS_TRACER
if (cx->runtime->gcZeal >= 1 && JS_TRACE_MONITOR(cx).useReservedObjects)
goto testReservedObjects;
#ifdef JS_TRACER
if (JS_TRACE_MONITOR(cx).useReservedObjects) {
JS_ASSERT(JS_ON_TRACE(cx));
JS_ASSERT(thingKind == FINALIZE_OBJECT);
JSTraceMonitor *tm = &JS_TRACE_MONITOR(cx);
thing = (JSGCThing *) tm->reservedObjects;
JS_ASSERT(thing);
tm->reservedObjects = JSVAL_TO_OBJECT(tm->reservedObjects->fslots[0]);
fromTraceReserve = true;
break;
}
#endif
thing = RefillFinalizableFreeList(cx, thingKind);
@ -1525,22 +1533,6 @@ NewFinalizableGCThing(JSContext *cx, unsigned thingKind)
break;
}
#ifdef JS_TRACER
if (JS_TRACE_MONITOR(cx).useReservedObjects) {
#ifdef JS_GC_ZEAL
testReservedObjects:
#endif
JS_ASSERT(JS_ON_TRACE(cx));
JS_ASSERT(thingKind == FINALIZE_OBJECT);
JSTraceMonitor *tm = &JS_TRACE_MONITOR(cx);
thing = (JSGCThing *) tm->reservedObjects;
JS_ASSERT(thing);
tm->reservedObjects = JSVAL_TO_OBJECT(tm->reservedObjects->fslots[0]);
fromTraceReserve = true;
break;
}
#endif
js_ReportOutOfMemory(cx);
return NULL;
}
@ -1709,6 +1701,8 @@ js_NewDoubleInRootedValue(JSContext *cx, jsdouble d, jsval *vp)
JSGCThing *thing = JS_THREAD_DATA(cx)->gcFreeLists.doubles;
if (!thing) {
if (JS_TRACE_MONITOR(cx).useReservedObjects)
return false;
thing = RefillDoubleFreeList(cx);
if (!thing) {
METER(astats->fail++);

27
js/src/jstracer.cpp
View File

@ -2887,14 +2887,7 @@ NativeToValueBase(JSContext* cx, jsval& v, JSTraceType type, double* slot)
if (JSDOUBLE_IS_INT(d, i))
goto store_int;
store_double:
if (js_NewDoubleInRootedValue(cx, d, &v))
return true;
/*
* It's not safe to trigger the GC here, so use an emergency heap
* if we are out of double boxes.
*/
return E::handleDoubleOOM(cx, d, v);
return E::NewDoubleInRootedValue(cx, d, v);
case TT_JSVAL:
v = *(jsval*)slot;
@ -2937,7 +2930,13 @@ NativeToValueBase(JSContext* cx, jsval& v, JSTraceType type, double* slot)
}
struct ReserveDoubleOOMHandler {
static bool handleDoubleOOM(JSContext *cx, double d, jsval& v) {
static bool NewDoubleInRootedValue(JSContext *cx, double d, jsval& v) {
JS_ASSERT(!JS_TRACE_MONITOR(cx).useReservedObjects);
JS_TRACE_MONITOR(cx).useReservedObjects = true;
bool ok = js_NewDoubleInRootedValue(cx, d, &v);
JS_TRACE_MONITOR(cx).useReservedObjects = false;
if (ok)
return true;
v = AllocateDoubleFromReservedPool(cx);
JS_ASSERT(JSVAL_IS_DOUBLE(v) && *JSVAL_TO_DOUBLE(v) == 0.0);
*JSVAL_TO_DOUBLE(v) = d;
@ -2956,9 +2955,13 @@ NativeToValue(JSContext* cx, jsval& v, JSTraceType type, double* slot)
}
struct FailDoubleOOMHandler {
static bool handleDoubleOOM(JSContext *cx, double d, jsval& v) {
js_ReportOutOfMemory(cx);
return false;
static bool NewDoubleInRootedValue(JSContext *cx, double d, jsval& v) {
bool ok = js_NewDoubleInRootedValue(cx, d, &v);
if (!ok) {
js_ReportOutOfMemory(cx);
return false;
}
return true;
}
};