Bommels05/Mozilla
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Model the stack depth correctly during ternary expressions. bug 349493, r=brendan

Browse Source 
git-svn-id: svn://10.0.0.236/trunk@208051 18797224-902f-48f8-a5cc-f745e15eee43
This commit is contained in:
mrbkap%gmail.com
2006-08-21 21:42:15 +00:00
parent 01c7c57254
commit c1d76f41f8
1 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mozilla/js/src/jsemit.c
View File

@@ -5065,22 +5065,24 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
if (jmp < 0)
return JS_FALSE;
CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, beq);
/*
* Because each branch pushes a single value, but our stack budgeting
* analysis ignores branches, we now have to adjust cg->stackDepth to
* ignore the value pushed by the first branch. Execution will follow
* only one path, so we must decrement cg->stackDepth. Failing to do
* this will foil code, such as the try/catch/finally exception
* handling code generator, that samples cg->stackDepth for use at
* runtime (JSOP_SETSP) or let expressions and statements, which must
* use the stack depth to find locals correctly.
*/
JS_ASSERT(cg->stackDepth > 0);
cg->stackDepth--;
if (!js_EmitTree(cx, cg, pn->pn_kid3))
return JS_FALSE;
CHECK_AND_SET_JUMP_OFFSET_AT(cx, cg, jmp);
if (!js_SetSrcNoteOffset(cx, cg, noteIndex, 0, jmp - beq))
return JS_FALSE;
/*
* Because each branch pushes a single value, but our stack budgeting
* analysis ignores branches, we now have two values accounted for in
* cg->stackDepth. Execution will follow only one path, so we must
* decrement cg->stackDepth here. Failing to do this will foil code,
* such as the try/catch/finally exception handling code generator,
* that samples cg->stackDepth for use at runtime (JSOP_SETSP).
*/
JS_ASSERT(cg->stackDepth > 1);
cg->stackDepth--;
break;
case TOK_OR: