Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-12 12:55:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix local function shadowing argument decompilation (351116, r=mrbkap).

Browse Source
This commit is contained in:
brendan%mozilla.org 2006-09-02 20:33:42 +00:00
parent 6a10138147
commit cd22c4371f
2 changed files with 22 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
js/src/jsopcode.c
View File

@ -3224,6 +3224,8 @@ js_DecompileFunction(JSPrinter *jp, JSFunction *fun)
js_puts(jp, "(");
if (FUN_INTERPRETED(fun) && fun->object) {
size_t paramsize;
/*
* Print the parameters.
*
@ -3237,12 +3239,13 @@ js_DecompileFunction(JSPrinter *jp, JSFunction *fun)
cx = jp->sprinter.context;
nargs = fun->nargs;
mark = JS_ARENA_MARK(&cx->tempPool);
JS_ARENA_ALLOCATE_CAST(params, JSAtom **, &cx->tempPool,
nargs * sizeof(JSAtom *));
paramsize = nargs * sizeof(JSAtom *);
JS_ARENA_ALLOCATE_CAST(params, JSAtom **, &cx->tempPool, paramsize);
if (!params) {
JS_ReportOutOfMemory(cx);
return JS_FALSE;
}
memset(params, 0, paramsize);
scope = OBJ_SCOPE(fun->object);
for (sprop = SCOPE_LAST_PROP(scope); sprop; sprop = sprop->parent) {
if (sprop->getter != js_GetArgument)

22
js/src/jsparse.c
View File

@ -1103,12 +1103,14 @@ FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
* local variable to bind its name to its value, and not an activation
* object property (it might also need the activation property, if the
* outer function contains with statements, e.g., but the stack slot
* wins when jsemit.c's LookupArgOrVar can optimize a JSOP_NAME into a
* wins when jsemit.c's BindNameToSlot can optimize a JSOP_NAME into a
* JSOP_GETVAR bytecode).
*/
if (AT_TOP_LEVEL(tc) && (tc->flags & TCF_IN_FUNCTION)) {
JSScopeProperty *sprop;
/*
* Define a property on the outer function so that LookupArgOrVar
* Define a property on the outer function so that BindNameToSlot
* can properly optimize accesses.
*/
JS_ASSERT(OBJ_GET_CLASS(cx, varobj) == &js_FunctionClass);
@ -1119,16 +1121,26 @@ FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
}
if (prop)
OBJ_DROP_PROPERTY(cx, pobj, prop);
sprop = NULL;
if (!prop ||
pobj != varobj ||
((JSScopeProperty *)prop)->getter != js_GetLocalVariable) {
(sprop = (JSScopeProperty *)prop,
sprop->getter != js_GetLocalVariable)) {
uintN sflags;
/*
* Use SPROP_IS_DUPLICATE if there is a formal argument of the
* same name, so the decompiler can find the parameter name.
*/
sflags = (sprop && sprop->getter == js_GetArgument)
? SPROP_IS_DUPLICATE | SPROP_HAS_SHORTID
: SPROP_HAS_SHORTID;
if (!js_AddHiddenProperty(cx, varobj, ATOM_TO_JSID(funAtom),
js_GetLocalVariable,
js_SetLocalVariable,
SPROP_INVALID_SLOT,
JSPROP_PERMANENT | JSPROP_SHARED,
SPROP_HAS_SHORTID,
fp->fun->u.i.nvars)) {
sflags, fp->fun->u.i.nvars)) {
return NULL;
}
if (fp->fun->u.i.nvars == JS_BITMASK(16)) {