wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 765280 - Fake stack depth, so various opcodes that depend on absolute stack depth are not confused, r=jorendorff

Browse Source
This commit is contained in:
Benjamin Peterson 2012-06-20 12:03:04 -07:00
parent c916642910
commit 4c0af0cfa1
2 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
js/src/jit-test/tests/arguments/defaults-decompile.js
View File

@ -42,3 +42,5 @@ function f13(a, b=4, ...rest) {
function b() { }
}
assertEq(f13.toString(), "function f13(a, b = 4, ...rest) {\n return b;\n\n function b() {\n }\n\n}");
function f14(x = let (y) 42, ...rest) {}
assertEq(f14.toString(), "function f14(x = let (y) 42, ...rest) {\n}");

13
js/src/jsopcode.cpp
View File

@ -5421,7 +5421,7 @@ Decompile(SprintStack *ss, jsbytecode *pc, int nb)
static JSBool
DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, unsigned len,
unsigned pcdepth)
unsigned pcdepth, unsigned initialStackDepth = 0)
{
JSContext *cx = jp->sprinter.context;
@ -5453,6 +5453,11 @@ DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, unsigned len,
}
}
for (unsigned i = 0; i < initialStackDepth; i++) {
if (!PushStr(&ss, "", JSOP_NOP))
return NULL;
}
/* Call recursive subroutine to do the hard work. */
JSScript *oldscript = jp->script;
jp->script = script;
@ -5460,11 +5465,11 @@ DecompileCode(JSPrinter *jp, JSScript *script, jsbytecode *pc, unsigned len,
jp->script = oldscript;
/* If the given code didn't empty the stack, do it now. */
if (ok && ss.top) {
if (ok && ss.top - initialStackDepth) {
const char *last;
do {
last = ss.sprinter.stringAt(PopOff(&ss, JSOP_POP));
} while (ss.top > pcdepth);
} while (ss.top - initialStackDepth > pcdepth);
js_printf(jp, "%s", last);
}
@ -5661,7 +5666,7 @@ js_DecompileFunction(JSPrinter *jp)
jsbytecode *caseend = defbegin + ((i < nformal - 1) ? TABLE_OFF(i - defstart + 1) : deflen);
#undef TABLE_OFF
unsigned exprlength = caseend - casestart - js_CodeSpec[JSOP_POP].length;
if (!DecompileCode(jp, script, casestart, exprlength, 0))
if (!DecompileCode(jp, script, casestart, exprlength, 0, fun->hasRest()))
return JS_FALSE;
} else if (!QuoteString(&jp->sprinter, param, 0)) {
ok = JS_FALSE;