From 534fb9f4c5cff764f3ef52730686a01263c26e96 Mon Sep 17 00:00:00 2001 From: Terrence Cole Date: Tue, 20 Jan 2015 10:57:13 -0800 Subject: [PATCH] Backout cafc08288982 (Bug 1111361) for a 19% regression on splay. --- js/src/gc/Marking.cpp | 6 ------ js/src/jsgc.cpp | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/js/src/gc/Marking.cpp b/js/src/gc/Marking.cpp index cd85aece5966..94500b5ee718 100644 --- a/js/src/gc/Marking.cpp +++ b/js/src/gc/Marking.cpp @@ -1741,12 +1741,6 @@ GCMarker::processMarkStackTop(SliceBudget &budget) scan_value_array: MOZ_ASSERT(vp <= end); while (vp != end) { - budget.step(); - if (budget.isOverBudget()) { - pushValueArray(obj, vp, end); - return; - } - const Value &v = *vp++; if (v.isString()) { markAndScanString(obj, v.toString()); diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp index a93c9102476f..b8b326e7768e 100644 --- a/js/src/jsgc.cpp +++ b/js/src/jsgc.cpp @@ -3190,7 +3190,7 @@ GCRuntime::maybeAllocTriggerZoneGC(Zone *zone, const AutoLockGC &lock) // The threshold has been surpassed, immediately trigger a GC, // which will be done non-incrementally. triggerZoneGC(zone, JS::gcreason::ALLOC_TRIGGER); - } else if (usedBytes >= igcThresholdBytes && interFrameGC) { + } else if (usedBytes >= igcThresholdBytes) { // Reduce the delay to the start of the next incremental slice. if (zone->gcDelayBytes < ArenaSize) zone->gcDelayBytes = 0;