Skip to content

Wrap for-using bindings in VariableDeclaratorNode #1999

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
marcoww6 wants to merge 1 commit into
base: static_h
Choose a base branch
from
+108 −8
Open

Wrap for-using bindings in VariableDeclaratorNode #1999

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions lib/Parser/JSParserImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1909,7 +1909,11 @@ Optional<ESTree::Node *> JSParserImpl::parseForStatement(Param param) {
if (!optIdent)
return None;
ESTree::NodeList declList;
declList.push_back(**optIdent);
auto *declarator = setLocation(
*optIdent,
*optIdent,
new (context_) ESTree::VariableDeclaratorNode(nullptr, *optIdent));
declList.push_back(*declarator);

decl = setLocation(
varStartLoc,
Expand All @@ -1929,7 +1933,11 @@ Optional<ESTree::Node *> JSParserImpl::parseForStatement(Param param) {
if (!optIdent)
return None;
ESTree::NodeList declList;
declList.push_back(**optIdent);
auto *declarator = setLocation(
*optIdent,
*optIdent,
new (context_) ESTree::VariableDeclaratorNode(nullptr, *optIdent));
declList.push_back(*declarator);

decl = setLocation(
varStartLoc,
Expand Down
45 changes: 45 additions & 0 deletions test/Parser/for-using-declarator.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,45 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

// RUN: %hermesc -dump-ast --pretty-json %s | %FileCheck %s --match-full-lines

// Regression test: in `for (using x of y)` and `for [await] (await using x of
// y)`, the binding must be wrapped in a `VariableDeclarator` (with `init:
// null`) inside `VariableDeclaration._declarations`, matching what
// `for (var x of y)` produces. Pushing a bare Identifier corrupts later
// stages that `cast<VariableDeclaratorNode>` over the list
// (https://github.com/facebook/hermes/issues/1981).

for (using x of y);
// CHECK: "type": "VariableDeclaration",
// CHECK-NEXT: "kind": "using",
// CHECK-NEXT: "declarations": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "VariableDeclarator",
// CHECK-NEXT: "init": null,
// CHECK-NEXT: "id": {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]

async function f() {
for await (await using x of y);
}
// CHECK: "type": "VariableDeclaration",
// CHECK-NEXT: "kind": "await using",
// CHECK-NEXT: "declarations": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "VariableDeclarator",
// CHECK-NEXT: "init": null,
// CHECK-NEXT: "id": {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
24 changes: 18 additions & 6 deletions test/Parser/for-using.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,12 @@ for (using x of y);
// CHECK-NEXT: "kind": "using",
// CHECK-NEXT: "declarations": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: "type": "VariableDeclarator",
// CHECK-NEXT: "init": null,
// CHECK-NEXT: "id": {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand All @@ -42,8 +46,12 @@ for (using x in y);
// CHECK-NEXT: "kind": "using",
// CHECK-NEXT: "declarations": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: "type": "VariableDeclarator",
// CHECK-NEXT: "init": null,
// CHECK-NEXT: "id": {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand Down Expand Up @@ -93,8 +101,12 @@ async function f() {
// CHECK-NEXT: "kind": "await using",
// CHECK-NEXT: "declarations": [
// CHECK-NEXT: {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: "type": "VariableDeclarator",
// CHECK-NEXT: "init": null,
// CHECK-NEXT: "id": {
// CHECK-NEXT: "type": "Identifier",
// CHECK-NEXT: "name": "x"
// CHECK-NEXT: }
// CHECK-NEXT: }
// CHECK-NEXT: ]
// CHECK-NEXT: },
Expand Down
35 changes: 35 additions & 0 deletions test/Sema/for-using-not-supported.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/**
* Copyright (c) Meta Platforms, Inc. and affiliates.
*
* This source code is licensed under the MIT license found in the
* LICENSE file in the root directory of this source tree.
*/

// RUN: (! %hermesc -emit-binary -out /dev/null -O0 %s 2>&1) | %FileCheck --match-full-lines %s
// RUN: (! %hermesc -emit-binary -out /dev/null -O %s 2>&1) | %FileCheck --match-full-lines %s

// Regression test: parsing `for (using x of y)` and `for [await] (await using
// x of y)` used to push a bare IdentifierNode into VariableDeclaration's
// `_declarations`. Sema helpers (`ScopedFunctionPromoter::extractDeclaredIdents`,
// `SemanticResolver::extractIdentsFromDecl`) then aborted via `Casting.h`
// `cast<VariableDeclaratorNode>` before reaching the explicit `using`
// rejection, masking the user-facing error and corrupting memory in release
// WASM (https://github.com/facebook/hermes/issues/1981).
//
// With the parser fix, the cast succeeds and Sema reaches the explicit
// rejection cleanly.

function for_of_using(arr) {
for (using x of arr) {}
}
// CHECK: {{.*}}for-using-not-supported.js:[[@LINE-2]]:8: error: using declarations are not yet supported

function for_in_using(obj) {
for (using x in obj) {}
}
// CHECK: {{.*}}for-using-not-supported.js:[[@LINE-2]]:8: error: using declarations are not yet supported

async function for_await_of_await_using(arr) {
for await (await using x of arr) {}
}
// CHECK: {{.*}}for-using-not-supported.js:[[@LINE-2]]:14: error: using declarations are not yet supported
Loading