Back out 96b591267cb3 (bug 745194) for test failures on a CLOSED TREE
authorPhil Ringnalda <philringnalda@gmail.com>
Fri, 14 Dec 2012 14:53:06 -0800
changeset 125235 9ec1c7f91699245e81615d764b61d99d2ff8cc76
parent 125234 b6e55016536127d675028ff20dbad8ef27d9ca8d
child 125236 75e1f24b9af752f879fbca8c649a41aa411584e9
push id2151
push userlsblakk@mozilla.com
push dateTue, 19 Feb 2013 18:06:57 +0000
treeherdermozilla-beta@4952e88741ec [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs745194
milestone20.0a1
backs out96b591267cb3ac21eadce063289f81734a60498c
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
Back out 96b591267cb3 (bug 745194) for test failures on a CLOSED TREE
js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-06.js
js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-07.js
js/src/methodjit/InvokeHelpers.cpp
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-06.js
+++ /dev/null
@@ -1,13 +0,0 @@
-// |jit-test| mjitalways
-// Bug 745194.
-
-var g = newGlobal('new-compartment');
-var dbg = Debugger(g);
-g.eval("function f() {}");
-dbg.onEnterFrame = function (frame) {
-    if (frame.type == 'call') {
-        gc();
-        return { return: 'PASS' };
-    }
-};
-assertEq(g.eval("f()"), 'PASS');
deleted file mode 100644
--- a/js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-07.js
+++ /dev/null
@@ -1,16 +0,0 @@
-// |jit-test| mjitalways
-// Bug 745194.
-
-var g = newGlobal('new-compartment');
-g.eval("function f() {}" +
-       "function h() { return new f; }");
-var dbg = Debugger(g);
-dbg.onEnterFrame = function (frame) {
-    if (frame.constructing) {
-        gc();
-        return { return: 0 };
-    }
-};
-var result = g.eval("h()");
-assertEq(typeof result, 'object');
-assertEq(Object.getPrototypeOf(result), g.f.prototype);
--- a/js/src/methodjit/InvokeHelpers.cpp
+++ b/js/src/methodjit/InvokeHelpers.cpp
@@ -663,29 +663,22 @@ void JS_FASTCALL
 stubs::ScriptDebugPrologue(VMFrame &f)
 {
     AssertCanGC();
     Probes::enterScript(f.cx, f.script(), f.script()->function(), f.fp());
     JSTrapStatus status = js::ScriptDebugPrologue(f.cx, f.fp());
     switch (status) {
       case JSTRAP_CONTINUE:
         break;
-
       case JSTRAP_RETURN:
-        if (!f.fp()->nativeReturnAddress()) {
-            // ClearAllFrames was called. Resume in the interpreter.
-            f.fp()->setNativeReturnAddress(JS_FUNC_TO_DATA_PTR(void *, JaegerInterpolineScripted));
-        }
         *f.returnAddressLocation() = f.cx->jaegerRuntime().forceReturnFromFastCall();
         return;
-
       case JSTRAP_ERROR:
       case JSTRAP_THROW:
         THROW();
-
       default:
         JS_NOT_REACHED("bad ScriptDebugPrologue status");
     }
 }
 
 void JS_FASTCALL
 stubs::ScriptDebugEpilogue(VMFrame &f)
 {