Backed out changeset c8adfe4f5995 (bug 1107525) for arm spidermonkey bustage
authorWes Kocher <wkocher@mozilla.com>
Mon, 08 Dec 2014 16:35:40 -0800
changeset 218773 78483a3e7b519f57616ef7291869278d05166d1e
parent 218772 da41a9308c2d009ae1e5f96d54db23531d80ffeb
child 218774 7ed611fb2797f42c63d879e6f3cf24d729196a8b
push id52631
push userkwierso@gmail.com
push dateTue, 09 Dec 2014 00:35:43 +0000
treeherdermozilla-inbound@78483a3e7b51 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1107525
milestone37.0a1
backs outc8adfe4f59950fa970b167dd916741d356a29fd6
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 c8adfe4f5995 (bug 1107525) for arm spidermonkey bustage
js/src/jit-test/tests/debug/bug1107525.js
js/src/jit/BaselineBailouts.cpp
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/bug1107525.js
+++ /dev/null
@@ -1,9 +0,0 @@
-// |jit-test| error: InternalError
-enableSPSProfiling();
-var g = newGlobal();
-g.parent = this;
-g.eval("new Debugger(parent).onExceptionUnwind = function () { hits++; };");
-function f() {
-    var x = f();
-}
-f();
--- a/js/src/jit/BaselineBailouts.cpp
+++ b/js/src/jit/BaselineBailouts.cpp
@@ -1096,25 +1096,18 @@ InitFromBailout(JSContext *cx, HandleScr
                     // no SPS entry will have been pushed.  Can be left alone.
                     //
                     // 3. If resuming into top-level code prologue, without ArgumentCheck,
                     // an SPS entry will have been pushed, and needs to be popped.
                     //
                     // 4. If resuming into top-level code main body, an SPS entry will
                     // have been pushed, and can be left alone.
                     //
-                    // 5. If resuming for propagating an exception for debug
-                    // mode, an SPS entry will have been pushed, and can be left
-                    // alone as we will resume into HandleException again in
-                    // Baseline.
-                    //
                     // Only need to handle case 3 here.
-                    if (!caller && bailoutKind != Bailout_ArgumentCheck &&
-                        !(excInfo && excInfo->propagatingIonExceptionForDebugMode()))
-                    {
+                    if (!caller && bailoutKind != Bailout_ArgumentCheck) {
                         JitSpew(JitSpew_BaselineBailouts,
                                 "      Popping SPS entry for outermost frame");
                         cx->runtime()->spsProfiler.exit(script, fun);
 
                         // Notify caller that the last SPS frame was popped, so not
                         // to do it again.
                         if (poppedLastSPSFrameOut)
                             *poppedLastSPSFrameOut = true;