From e77d8570d468c42ac0921e82882c810159b1eb84 Mon Sep 17 00:00:00 2001
From: Jon Coppeard <jcoppeard@mozilla.com>
Date: Tue, 24 Feb 2015 09:40:02 +0000
Subject: [PATCH] Bug 1133759 - Always shrink GC buffers at the end of a
 shrinking GC, even if we don't compact r=terrence

---
 js/src/jsgc.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/js/src/jsgc.cpp b/js/src/jsgc.cpp
index 0fcd96193f2..6a99ce4ec09 100644
--- a/js/src/jsgc.cpp
+++ b/js/src/jsgc.cpp
@@ -5520,10 +5520,6 @@ GCRuntime::compactPhase(JS::gcreason::Reason reason)
     }
 #endif
 
-    // Ensure execess chunks are returns to the system and free arenas
-    // decommitted.
-    shrinkBuffers();
-
 #ifdef DEBUG
     CheckHashTablesAfterMovingGC(rt);
     for (GCZonesIter zone(rt); !zone.done(); zone.next()) {
@@ -5569,6 +5565,10 @@ GCRuntime::finishCollection(JS::gcreason::Reason reason)
         MOZ_ASSERT(!zone->wasGCStarted());
     }
 
+    // Ensure execess chunks are returned to the system and free arenas
+    // decommitted.
+    shrinkBuffers();
+
     lastGCTime = currentTime;
 
     // If this is an OOM GC reason, wait on the background sweeping thread