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

Fix upvar decompilation for eval-from-fun case.

Browse Source
This commit is contained in:
Brendan Eich 2008-08-27 02:21:04 -07:00
parent 9cb246a8fc
commit 4de45a4139
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
js/src/jsopcode.cpp
View File

@ -2696,6 +2696,25 @@ Decompile(SprintStack *ss, jsbytecode *pc, intN nb, JSOp nextop)
case JSOP_CALLUPVAR:
case JSOP_GETUPVAR:
i = JS_UPVAR_LOCAL_NAME_START(jp->fun) + GET_UINT16(pc);
if (i >= JS_GET_LOCAL_NAME_COUNT(jp->fun)) {
JSUpvarArray *uva;
/*
* We must be in an eval called from jp->fun, where
* jp->script is the eval-compiled script.
*/
JS_ASSERT(cx->fp->flags & JSFRAME_EVAL);
JS_ASSERT(cx->fp->script == jp->script);
JS_ASSERT(cx->fp->down->fun == jp->fun);
JS_ASSERT(FUN_INTERPRETED(jp->fun));
JS_ASSERT(jp->script != jp->fun->u.i.script);
JS_ASSERT(jp->script->upvarsOffset != 0);
uva = JS_SCRIPT_UPVARS(jp->script);
i = GET_UINT16(pc);
JS_ASSERT(UPVAR_FRAME_SKIP(uva->vector[i]) == 1);
i = UPVAR_FRAME_SLOT(uva->vector[i]);
}
atom = GetArgOrVarAtom(jp, i);
goto do_name;