Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-10 20:05:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1249183 - Suppress GC harder, r=terrence

Browse Source 
--HG--
extra : rebase_source : f6d1c9deda5da4fa0c8852705995d87a8d7c0d19
This commit is contained in:
Steve Fink 2016-02-17 17:42:12 -08:00
parent 2ba7941cda
commit ad179d42f2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
js/src/jscntxt.cpp
View File

@ -295,12 +295,11 @@ js::ReportOutOfMemory(ExclusiveContext* cxArg)
JSContext* cx = cxArg->asJSContext();
cx->runtime()->hadOutOfMemory = true;
AutoSuppressGC suppressGC(cx);
/* Report the oom. */
if (JS::OutOfMemoryCallback oomCallback = cx->runtime()->oomCallback) {
AutoSuppressGC suppressGC(cx);
if (JS::OutOfMemoryCallback oomCallback = cx->runtime()->oomCallback)
oomCallback(cx, cx->runtime()->oomCallbackData);
}
if (cx->options().autoJSAPIOwnsErrorReporting() || JS_IsRunning(cx)) {
cx->setPendingException(StringValue(cx->names().outOfMemory));
@ -318,10 +317,8 @@ js::ReportOutOfMemory(ExclusiveContext* cxArg)
PopulateReportBlame(cx, &report);
/* Report the error. */
if (JSErrorReporter onError = cx->runtime()->errorReporter) {
AutoSuppressGC suppressGC(cx);
if (JSErrorReporter onError = cx->runtime()->errorReporter)
onError(cx, msg, &report);
}
/*
* We would like to enforce the invariant that any exception reported