зеркало из https://github.com/mozilla/gecko-dev.git
Bug 341499: The assert in js_NewGCThing about not running GC now takes into account that we allow allocation from close hooks. r=mrbkap
This commit is contained in:
Родитель
e43c76eb9d
Коммит
5c77935888
|
@ -820,8 +820,8 @@ js_NewGCThing(JSContext *cx, uintN flags, size_t nbytes)
|
|||
rt->gcMallocBytes += localMallocBytes;
|
||||
}
|
||||
#endif
|
||||
JS_ASSERT(!rt->gcRunning);
|
||||
if (rt->gcRunning) {
|
||||
JS_ASSERT(!rt->gcRunning || rt->gcClosePhase);
|
||||
if (rt->gcRunning && !rt->gcClosePhase) {
|
||||
METER(rt->gcStats.finalfail++);
|
||||
JS_UNLOCK_GC(rt);
|
||||
return NULL;
|
||||
|
|
Загрузка…
Ссылка в новой задаче