Bug 1111245 - Remove an incoherent OOM assertion; r=jorendorff
authorTerrence Cole <terrence@mozilla.com>
Thu, 18 Dec 2014 10:17:22 -0800
changeset 235493 69814624bb027225c02da63ab5a6d37940fe64fb
parent 235492 4af240ffb89940b95ee0eaa34b5e2ddc79f1f183
child 235494 3d2cbf625d1cff443957dca61e85a78917b5dc56
push id366
push usercmanchester@mozilla.com
push dateThu, 08 Jan 2015 16:40:24 +0000
reviewersjorendorff
bugs1111245
milestone37.0a1
Bug 1111245 - Remove an incoherent OOM assertion; r=jorendorff
js/src/jscntxt.cpp
--- a/js/src/jscntxt.cpp
+++ b/js/src/jscntxt.cpp
@@ -1002,18 +1002,16 @@ ThreadSafeContext::asForkJoinContext()
 void
 ThreadSafeContext::recoverFromOutOfMemory()
 {
     // If this is not a JSContext, there's nothing to do.
     if (JSContext *maybecx = maybeJSContext()) {
         if (maybecx->isExceptionPending()) {
             MOZ_ASSERT(maybecx->isThrowingOutOfMemory());
             maybecx->clearPendingException();
-        } else {
-            MOZ_ASSERT(maybecx->runtime()->hadOutOfMemory);
         }
     }
 }
 
 JSContext::JSContext(JSRuntime *rt)
   : ExclusiveContext(rt, &rt->mainThread, Context_JS),
     throwing(false),
     unwrappedException_(UndefinedValue()),