Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-13 11:38:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Back out 96b591267cb3 (bug 745194) for test failures on a CLOSED TREE

Browse Source
This commit is contained in:
Phil Ringnalda 2012-12-14 14:53:06 -08:00
parent 9c8dded539
commit 404e6b04eb
3 changed files with 0 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-06.js
View File

@ -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');

16
js/src/jit-test/tests/debug/Debugger-onEnterFrame-resumption-07.js
View File

@ -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);

7
js/src/methodjit/InvokeHelpers.cpp
View File

@ -668,19 +668,12 @@ stubs::ScriptDebugPrologue(VMFrame &f)
switch (status) { switch (status) {
case JSTRAP_CONTINUE: case JSTRAP_CONTINUE:
break; break;
case JSTRAP_RETURN: 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(); *f.returnAddressLocation() = f.cx->jaegerRuntime().forceReturnFromFastCall();
return; return;
case JSTRAP_ERROR: case JSTRAP_ERROR:
case JSTRAP_THROW: case JSTRAP_THROW:
THROW(); THROW();
default: default:
JS_NOT_REACHED("bad ScriptDebugPrologue status"); JS_NOT_REACHED("bad ScriptDebugPrologue status");
} }