Bug 1111245 - Remove an incoherent OOM assertion; r=jorendorff
authorTerrence Cole <terrence@mozilla.com>
Thu, 18 Dec 2014 10:17:22 -0800
changeset 248346 69814624bb027225c02da63ab5a6d37940fe64fb
parent 248345 4af240ffb89940b95ee0eaa34b5e2ddc79f1f183
child 248347 3d2cbf625d1cff443957dca61e85a78917b5dc56
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorendorff
bugs1111245
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 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()),