mozilla-central: changeset 57828:9baf4ce0920b157152e6f17323ea2fb08a01d498

author	Jeff Walden <jwalden@mit.edu>
	Tue, 16 Nov 2010 14:13:18 -0800
changeset 57828	9baf4ce0920b157152e6f17323ea2fb08a01d498
parent 57827	f3cfb74fd41301d9d01d942a53aaffa30d2678f9
child 57829	c5b733682ecef38251b07cb6811f2ccbdcae522a
push id	17032
push user	rsayre@mozilla.com
push date	Wed, 17 Nov 2010 21:55:39 +0000
treeherder	mozilla-central@78a42f77bb90 [default view] [failures only]
perfherder	[talos] [build metrics] [platform microbench] (compared to previous push)
reviewers	dvander
bugs	612481
milestone	2.0b8pre
first release with	nightly linux32 c391595f5561 / 4.0b8pre / 20101118041411 / files nightly linux64 c391595f5561 / 4.0b8pre / 20101118050543 / files nightly mac 789f0f85f75a / 4.0b8pre / 20101118063017 / files nightly win32 789f0f85f75a / 4.0b8pre / 20101118090636 / files nightly win64 c391595f5561 / 4.0b8pre / 20101118044556 / files
last release without	nightly linux32 a42e9b001bc8 / 4.0b8pre / 20101116031409 / files nightly linux64 a42e9b001bc8 / 4.0b8pre / 20101116030836 / files nightly mac a42e9b001bc8 / 4.0b8pre / 20101116030753 / files nightly win32 a42e9b001bc8 / 4.0b8pre / 20101116042306 / files nightly win64 a42e9b001bc8 / 4.0b8pre / 20101116044427 / files

--- a/js/src/jsemit.cpp
+++ b/js/src/jsemit.cpp
@@ -3813,17 +3813,18 @@ MaybeEmitVarDecl(JSContext *cx, JSCodeGe
     {
         CG_SWITCH_TO_PROLOG(cg);
         if (!UpdateLineNumberNotes(cx, cg, pn->pn_pos.begin.lineno))
             return JS_FALSE;
         EMIT_INDEX_OP(prologOp, atomIndex);
         CG_SWITCH_TO_MAIN(cg);
     }
 
-    if (JOF_OPTYPE(pn->pn_op) == JOF_LOCAL &&
+    if (cg->inFunction() &&
+        JOF_OPTYPE(pn->pn_op) == JOF_LOCAL &&
         pn->pn_cookie.slot() < cg->fun->u.i.nvars &&
         cg->shouldNoteClosedName(pn))
     {
         if (!cg->closedVars.append(pn->pn_cookie.slot()))
             return JS_FALSE;
     }
 
     if (result)