]> git.kaiwu.me - njs.git/commitdiff
Fix initialization checks for identifier expression statements
authorDmitry Volyntsev <xeioex@nginx.com>
Thu, 12 Nov 2026 02:20:38 +0000 (18:20 -0800)
committerDmitry Volyntsev <xeioexception@gmail.com>
Thu, 12 Nov 2026 20:57:17 +0000 (12:57 -0800)
Previously, a bare identifier statement emitted its initialization
check before the preceding statements.  An initialized let or const
binding could therefore throw ReferenceError, and side effects before
a real TDZ error could be skipped.

The issue was introduced in 158f54e6 (0.6.0), which added let.

Defer identifier resolution and its initialization check until the
preceding statements have been generated.  This preserves the existing
unused-value optimization and runtime checks for captured bindings,
while evaluating statements in source order as required by ECMA-262.

This closes #1151 issue on GitHub.

src/njs_generator.c
src/test/njs_unit_test.c

index a45d5185344d9a82084481a7e8f17696cd063c55..0544a7ef59c2a3e5b3a104ba453598ff9f794d8a 100644 (file)
@@ -402,6 +402,8 @@ static njs_int_t njs_generate_debugger_statement(njs_vm_t *vm,
     njs_generator_t *generator, njs_parser_node_t *node);
 static njs_int_t njs_generate_statement(njs_vm_t *vm,
     njs_generator_t *generator, njs_parser_node_t *node);
+static njs_int_t njs_generate_statement_name(njs_vm_t *vm,
+    njs_generator_t *generator, njs_parser_node_t *node);
 static njs_int_t njs_generate_block_statement(njs_vm_t *vm,
     njs_generator_t *generator, njs_parser_node_t *node);
 static njs_int_t njs_generate_block_statement_end(njs_vm_t *vm,
@@ -3056,37 +3058,28 @@ static njs_int_t
 njs_generate_statement(njs_vm_t *vm, njs_generator_t *generator,
     njs_parser_node_t *node)
 {
-    njs_int_t              ret;
-    njs_variable_t         *var;
-    njs_queue_link_t       *link;
-    njs_parser_node_t      *right;
-    njs_vmcode_variable_t  *code;
+    njs_int_t          ret;
+    njs_queue_link_t   *link;
+    njs_parser_node_t  *right;
 
     right = node->right;
 
     if (right != NULL && right->token_type == NJS_TOKEN_NAME) {
-        var = njs_variable_reference(vm, generator->mem_pool, right);
-        if (njs_slow_path(var == NULL)) {
-            goto statement;
-        }
-
-        if (!var->init && (var->type == NJS_VARIABLE_LET
-            || var->type == NJS_VARIABLE_CONST))
-        {
-            njs_generate_code(generator, njs_vmcode_variable_t, code,
-                              NJS_VMCODE_INITIALIZATION_TEST, right);
-            code->dst = right->index;
-        }
+        njs_generator_next(generator, njs_generate, node->left);
 
-        if (node->left == NULL) {
-            return njs_generator_stack_pop(vm, generator, NULL);
+        ret = njs_generator_after(vm, generator,
+                                  njs_queue_first(&generator->stack), right,
+                                  njs_generate_statement_name, NULL, 0);
+        if (njs_slow_path(ret != NJS_OK)) {
+            return ret;
         }
 
-        node = node->left;
+        return njs_generator_after(vm, generator,
+                                   njs_queue_first(&generator->stack),
+                                   node->left,
+                                   njs_generate_node_index_release_pop, NULL, 0);
     }
 
-statement:
-
     link = njs_queue_first(&generator->stack);
 
     ret = njs_generate_children(vm, generator, node);
@@ -3098,6 +3091,31 @@ statement:
                                njs_generate_node_index_release_pop, NULL, 0);
 }
 
+
+static njs_int_t
+njs_generate_statement_name(njs_vm_t *vm, njs_generator_t *generator,
+    njs_parser_node_t *node)
+{
+    njs_variable_t         *var;
+    njs_vmcode_variable_t  *code;
+
+    var = njs_variable_reference(vm, generator->mem_pool, node);
+    if (njs_slow_path(var == NULL)) {
+        return njs_generate_name(vm, generator, node);
+    }
+
+    if (!var->init && (var->type == NJS_VARIABLE_LET
+                      || var->type == NJS_VARIABLE_CONST))
+    {
+        njs_generate_code(generator, njs_vmcode_variable_t, code,
+                          NJS_VMCODE_INITIALIZATION_TEST, node);
+        code->dst = node->index;
+    }
+
+    return njs_generator_stack_pop(vm, generator, NULL);
+}
+
+
 static njs_int_t
 njs_generate_block_statement(njs_vm_t *vm, njs_generator_t *generator,
     njs_parser_node_t *node)
index 45a1b252ab47e8b2bcc80cf8edd55946182f9a42..efc64d82ebb2a921ba4248e51774f3e3f6fe378a 100644 (file)
@@ -20794,6 +20794,49 @@ static njs_unit_test_t  njs_test[] =
     { njs_str("let x = [123]; x"),
       njs_str("123") },
 
+    { njs_str("function f() {let x = 1; x; return x} f()"),
+      njs_str("1") },
+
+    { njs_str("function f() {const x = 1; x; return x} f()"),
+      njs_str("1") },
+
+    { njs_str("var result; {let x = 1; x; result = x} result"),
+      njs_str("1") },
+
+    { njs_str("function f() {let x; x; return x} f()"),
+      njs_str("undefined") },
+
+    { njs_str("function f() {let x = 1; x; x++; x; return x} f()"),
+      njs_str("2") },
+
+    { njs_str("function f() {let x = 1; {const x = 2; x;} x; return x}"
+              "f()"),
+      njs_str("1") },
+
+    { njs_str("function f() {let x = 1; return () => {x; return x}}"
+              "f()()"),
+      njs_str("1") },
+
+    { njs_str("function f() {let x = 1; if (true) {x;} return x} f()"),
+      njs_str("1") },
+
+    { njs_str("function f() {x; let x = 1} f()"),
+      njs_str("ReferenceError: cannot access variable before initialization") },
+
+    { njs_str("function f() {x; const x = 1} f()"),
+      njs_str("ReferenceError: cannot access variable before initialization") },
+
+    { njs_str("function f() {let x = 1; {x; let x = 2}} f()"),
+      njs_str("ReferenceError: cannot access variable before initialization") },
+
+    { njs_str("function f() {function g() {x;} g(); let x = 1} f()"),
+      njs_str("ReferenceError: cannot access variable before initialization") },
+
+    { njs_str("function f() {var result = 0;"
+              "try {result = 1; x; let x = 2} catch (e) {return result}}"
+              "f()"),
+      njs_str("1") },
+
     { njs_str("let x = () => x; x()"),
       njs_str("[object Function]") },