Backed out changeset 6d425a16fe7c (bug 1118996) on a CLOSED TREE
authorJon Coppeard <jcoppeard@mozilla.com>
Fri, 09 Jan 2015 13:56:57 +0000
changeset 248835 936382a9e919c911ec18daf5452129b7a361a00b
parent 248834 61fdafc3b45c035674d2f55be85adc0328c74bf6
child 248836 fce8528ac1e2385acd313595e52a4367cfd30ca8
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)
bugs1118996
milestone37.0a1
backs out6d425a16fe7ccd60b2dbd2d4050d41e750964a01
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
Backed out changeset 6d425a16fe7c (bug 1118996) on a CLOSED TREE
js/src/jit-test/tests/basic/bug1118996.js
js/src/shell/js.cpp
deleted file mode 100644
--- a/js/src/jit-test/tests/basic/bug1118996.js
+++ /dev/null
@@ -1,7 +0,0 @@
-// |jit-test| allow-oom
-g = newGlobal();
-gcparam('maxBytes', gcparam('gcBytes'));
-evaluate("return 0", ({
-    global: g,
-    newContext: true
-}));
--- a/js/src/shell/js.cpp
+++ b/js/src/shell/js.cpp
@@ -986,17 +986,17 @@ class AutoNewContext
     ~AutoNewContext() {
         if (newcx) {
             RootedValue exc(oldcx);
             bool throwing = JS_IsExceptionPending(newcx);
             if (throwing)
                 JS_GetPendingException(newcx, &exc);
             newCompartment.reset();
             newRequest.reset();
-            if (throwing && JS_WrapValue(oldcx, &exc))
+            if (throwing)
                 JS_SetPendingException(oldcx, exc);
             DestroyContext(newcx, false);
         }
     }
 };
 
 static void
 my_LargeAllocFailCallback(void *data)