Bug 1235677 - Wait for helper threads before resetting OOM simulation r=terrence

This commit is contained in:
Jon Coppeard 2016-03-16 09:41:56 +00:00
parent aa560b9071
commit 566118d25e

View File

@ -1217,6 +1217,7 @@ ResetOOMFailure(JSContext* cx, unsigned argc, Value* vp)
{
CallArgs args = CallArgsFromVp(argc, vp);
args.rval().setBoolean(OOM_counter >= OOM_maxAllocations);
HelperThreadState().waitForAllThreads();
js::oom::targetThread = js::oom::THREAD_TYPE_NONE;
OOM_maxAllocations = UINT32_MAX;
return true;