From b568b03d618b284d3e1c1b5a52c25194650c2100 Mon Sep 17 00:00:00 2001
From: "brendan%mozilla.org" <brendan%mozilla.org>
Date: Wed, 13 Jul 2005 02:12:28 +0000
Subject: [PATCH] Oops, tree wasn't open -- Chase needs to pull again, so
 backing out temporarily.

---
 js/src/jsemit.c  | 6 +-----
 js/src/jsparse.c | 4 +---
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/js/src/jsemit.c b/js/src/jsemit.c
index 5b9abd314b9..3711850992c 100644
--- a/js/src/jsemit.c
+++ b/js/src/jsemit.c
@@ -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)) {
diff --git a/js/src/jsparse.c b/js/src/jsparse.c
index ff360f8aadd..11e557a6f2e 100644
--- a/js/src/jsparse.c
+++ b/js/src/jsparse.c
@@ -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,