Bug 1108824 - Remove an excess js_ReportOutOfMemory in refillFreeLists; r=jorendorff
authorTerrence Cole <terrence@mozilla.com>
Tue, 09 Dec 2014 08:56:34 -0800
changeset 218907 c291b2eac8090c5d6b6f4e02b3f6d479e5450b55
parent 218906 dc0fcf005cf97b17eae78b8da6d5db218ccc3a67
child 218908 817f770bff547fc9c0109d4476ddca867000fd8a
push id52674
push usertcole@mozilla.com
push dateTue, 09 Dec 2014 20:01:27 +0000
treeherdermozilla-inbound@c291b2eac809 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1108824
milestone37.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1108824 - Remove an excess js_ReportOutOfMemory in refillFreeLists; r=jorendorff
js/src/jsgc.cpp
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -3035,17 +3035,16 @@ GCRuntime::refillFreeListFromMainThread(
     bool outOfMemory = false;  // Set true if we fail to allocate.
     bool ranGC = false;  // Once we've GC'd and still cannot allocate, report.
     do {
         if (MOZ_UNLIKELY(mustCollectNow || outOfMemory)) {
             // If we are doing a fallible allocation, percolate up the OOM
             // instead of reporting it.
             if (!allowGC) {
                 MOZ_ASSERT(!mustCollectNow);
-                js_ReportOutOfMemory(cx);
                 return nullptr;
             }
 
             if (void *thing = RunLastDitchGC(cx, zone, thingKind))
                 return thing;
             ranGC = true;
         }