From a3ea177df124d6643ce954951e6741bd8d5ac704 Mon Sep 17 00:00:00 2001
From: "brendan@mozilla.org" <brendan@mozilla.org>
Date: Mon, 7 Jan 2008 01:41:28 -0800
Subject: [PATCH] Require explicit body block in 'for (let x ...) let y...'
 (410981, r=mrbkap).

---
 js/src/jsemit.h  |  1 +
 js/src/jsparse.c | 20 ++++++++++++--------
 2 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/js/src/jsemit.h b/js/src/jsemit.h
index 1bd9f5c7dfd4..b6f009f4840b 100644
--- a/js/src/jsemit.h
+++ b/js/src/jsemit.h
@@ -136,6 +136,7 @@ struct JSStmtInfo {
 
 #define SIF_SCOPE        0x0001     /* statement has its own lexical scope */
 #define SIF_BODY_BLOCK   0x0002     /* STMT_BLOCK type is a function body */
+#define SIF_FOR_BLOCK    0x0004     /* for (let ...) induced block scope */
 
 /*
  * To reuse space in JSStmtInfo, rename breaks and continues for use during
diff --git a/js/src/jsparse.c b/js/src/jsparse.c
index 9f7b7f845423..f09c3db34525 100644
--- a/js/src/jsparse.c
+++ b/js/src/jsparse.c
@@ -2669,6 +2669,7 @@ Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
                     pnlet = PushLexicalScope(cx, ts, tc, &blockInfo);
                     if (!pnlet)
                         return NULL;
+                    blockInfo.flags |= SIF_FOR_BLOCK;
                     pn1 = Variables(cx, ts, tc);
                 }
 #endif
@@ -3190,16 +3191,19 @@ Statement(JSContext *cx, JSTokenStream *ts, JSTreeContext *tc)
         }
 
         /*
-         * This is a let declaration. We must convert the nearest JSStmtInfo
-         * that is a block or a switch body to be our scope statement. Further
-         * let declarations in this block will find this scope statement and
-         * use the same block object. If we are the first let declaration in
-         * this block (i.e., when the nearest maybe-scope JSStmtInfo isn't a
-         * scope statement) then we also need to set tc->blockNode to be our
-         * TOK_LEXICALSCOPE.
+         * This is a let declaration. We must be directly under a block per
+         * the proposed ES4 specs, but not an implicit block created due to
+         * 'for (let ...)'. If we pass this error test, make the enclosing
+         * JSStmtInfo be our scope. Further let declarations in this block
+         * will find this scope statement and use the same block object.
+         *
+         * If we are the first let declaration in this block (i.e., when the
+         * enclosing maybe-scope JSStmtInfo isn't yet a scope statement) then
+         * we also need to set tc->blockNode to be our TOK_LEXICALSCOPE.
          */
         stmt = tc->topStmt;
-        if (stmt && !STMT_MAYBE_SCOPE(stmt)) {
+        if (stmt &&
+            (!STMT_MAYBE_SCOPE(stmt) || (stmt->flags & SIF_FOR_BLOCK))) {
             js_ReportCompileErrorNumber(cx, ts, NULL, JSREPORT_ERROR,
                                         JSMSG_LET_DECL_NOT_IN_BLOCK);
             return NULL;