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

Oops, tree wasn't open -- Chase needs to pull again, so backing out temporarily.

Browse Source
This commit is contained in:
brendan%mozilla.org 2005-07-13 02:12:28 +00:00
parent 8fa0dc46a2
commit 5a2cebdfa7
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
js/src/jsemit.c
View File

@ -2892,7 +2892,6 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
if (cg->treeContext.flags & TCF_IN_FUNCTION) {
JSObject *obj, *pobj;
JSProperty *prop;
JSScopeProperty *sprop;
uintN slot;
obj = OBJ_GET_PARENT(cx, fun->object);
@ -2900,11 +2899,8 @@ js_EmitTree(JSContext *cx, JSCodeGenerator *cg, JSParseNode *pn)
&pobj, &prop)) {
return JS_FALSE;
}
JS_ASSERT(prop && pobj == obj);
sprop = (JSScopeProperty *) prop;
JS_ASSERT(sprop->getter == js_GetLocalVariable);
slot = sprop->shortid;
slot = ((JSScopeProperty *) prop)->shortid;
OBJ_DROP_PROPERTY(cx, pobj, prop);
if (atomIndex >= JS_BIT(16)) {

4
js/src/jsparse.c
View File

@ -830,9 +830,7 @@ FunctionDef(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc,
}
if (prop)
OBJ_DROP_PROPERTY(cx, pobj, prop);
if (!prop ||
pobj != varobj ||
((JSScopeProperty *)prop)->getter != js_GetLocalVariable) {
if (!prop || pobj != varobj) {
if (!js_AddHiddenProperty(cx, varobj, ATOM_TO_JSID(funAtom),
js_GetLocalVariable,
js_SetLocalVariable,