From 81dec328b4bece2fa198c874c893675ef743a233 Mon Sep 17 00:00:00 2001
From: Terrence Cole <terrence@mozilla.com>
Date: Fri, 10 May 2013 15:57:11 -0700
Subject: [PATCH] Bug 869733 - Assert we don't try to nursery allocate inside
 GC code; r=billm

--HG--
extra : rebase_source : 5cd269e8b904fba8cf80cd99c2ce9bea158e09b2
---
 js/src/gc/Nursery.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/js/src/gc/Nursery.cpp b/js/src/gc/Nursery.cpp
index 19ad94b77a9..90848992a8d 100644
--- a/js/src/gc/Nursery.cpp
+++ b/js/src/gc/Nursery.cpp
@@ -68,6 +68,7 @@ js::Nursery::allocate(size_t size)
 {
     JS_ASSERT(size % ThingAlignment == 0);
     JS_ASSERT(position() % ThingAlignment == 0);
+    JS_ASSERT(!runtime()->isHeapBusy());
 
     if (position() + size > end())
         return NULL;