{"parents":["58a8d0bdc74262a2e207a4075e0e59e5fc31d84b"],"commit":{"authorName":"Joe Savona","shortRevision":"8176f25719","authorEmail":"joesavona@fb.com","authoredAt":"2023-07-08T22:59:54+09:00","subject":"[rust] ForStatement support","revision":"8176f25719da6f99be829f4e1400a10f34c6bff9"},"files":[{"path":"compiler\/forget\/crates\/build-hir\/src\/build.rs","status":"M"},{"path":"compiler\/forget\/crates\/build-hir\/src\/builder.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree-swc\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/estree\/src\/lib.rs","status":"M"},{"path":"compiler\/forget\/crates\/fixtures\/tests\/fixtures\/for-statement.js","status":"A"},{"path":"compiler\/forget\/crates\/fixtures\/tests\/snapshots\/fixtures_test__fixtures@for-statement.js.snap","status":"A"},{"path":"compiler\/forget\/crates\/hir\/src\/instruction.rs","status":"M"},{"path":"compiler\/forget\/crates\/hir\/src\/print.rs","status":"M"},{"path":"compiler\/forget\/crates\/hir\/src\/terminal.rs","status":"M"}],"patch":"diff --git a\/compiler\/forget\/crates\/build-hir\/src\/build.rs b\/compiler\/forget\/crates\/build-hir\/src\/build.rs\nindex 743117cc2d..8ca67ec204 100644\n--- a\/compiler\/forget\/crates\/build-hir\/src\/build.rs\n+++ b\/compiler\/forget\/crates\/build-hir\/src\/build.rs\n@@ -1,14 +1,15 @@\n use bumpalo::collections::{CollectIn, String};\n use estree::{\n- AssignmentTarget, ExpressionLike, FunctionDeclaration, IfStatement, Literal, LiteralValue,\n- Pattern, Statement, VariableDeclarationKind,\n+ AssignmentTarget, BinaryExpression, ExpressionLike, ForInit, ForStatement, FunctionDeclaration,\n+ IfStatement, Literal, LiteralValue, Pattern, Statement, VariableDeclarationKind,\n };\n use hir::{\n- ArrayElement, BlockKind, Environment, Function, GotoKind, Identifier, InstructionKind,\n- InstructionValue, LValue, LoadGlobal, LoadLocal, Place, PrimitiveValue, TerminalValue,\n+ ArrayElement, BlockKind, BranchTerminal, Environment, ForTerminal, Function, GotoKind,\n+ Identifier, InstructionKind, InstructionValue, LValue, LoadGlobal, LoadLocal, Place,\n+ PrimitiveValue, TerminalValue,\n };\n \n-use crate::builder::{Binding, Builder};\n+use crate::builder::{Binding, Builder, LoopScope};\n \n \/\/\/ Converts a React function in ESTree format into HIR. Returns the HIR\n \/\/\/ if it was constructed sucessfully, otherwise a list of diagnostics\n@@ -35,7 +36,7 @@ pub fn build<'a>(\n }),\n );\n builder.terminate(\n- TerminalValue::ReturnTerminal(hir::ReturnTerminal {\n+ TerminalValue::Return(hir::ReturnTerminal {\n value: implicit_return_value,\n }),\n hir::BlockKind::Block,\n@@ -55,7 +56,7 @@ fn lower_statement<'a>(\n env: &'a Environment<'a>,\n builder: &mut Builder<'a>,\n stmt: Statement,\n- _label: Option>,\n+ label: Option>,\n ) -> Result<(), Diagnostic> {\n match stmt {\n Statement::BlockStatement(stmt) => {\n@@ -66,7 +67,7 @@ fn lower_statement<'a>(\n Statement::BreakStatement(stmt) => {\n let block = builder.resolve_break(stmt.label.as_ref())?;\n builder.terminate(\n- TerminalValue::GotoTerminal(hir::GotoTerminal {\n+ TerminalValue::Goto(hir::GotoTerminal {\n block,\n kind: GotoKind::Break,\n }),\n@@ -76,7 +77,7 @@ fn lower_statement<'a>(\n Statement::ContinueStatement(stmt) => {\n let block = builder.resolve_continue(stmt.label.as_ref())?;\n builder.terminate(\n- TerminalValue::GotoTerminal(hir::GotoTerminal {\n+ TerminalValue::Goto(hir::GotoTerminal {\n block,\n kind: GotoKind::Continue,\n }),\n@@ -95,7 +96,7 @@ fn lower_statement<'a>(\n ),\n };\n builder.terminate(\n- TerminalValue::ReturnTerminal(hir::ReturnTerminal { value }),\n+ TerminalValue::Return(hir::ReturnTerminal { value }),\n BlockKind::Block,\n );\n }\n@@ -158,7 +159,7 @@ fn lower_statement<'a>(\n \n let consequent_block = builder.enter(BlockKind::Block, |builder| {\n lower_statement(env, builder, consequent, None).unwrap();\n- TerminalValue::GotoTerminal(hir::GotoTerminal {\n+ TerminalValue::Goto(hir::GotoTerminal {\n block: fallthrough_block.id,\n kind: GotoKind::Break,\n })\n@@ -168,14 +169,14 @@ fn lower_statement<'a>(\n if let Some(alternate) = alternate {\n lower_statement(env, builder, alternate, None).unwrap();\n }\n- TerminalValue::GotoTerminal(hir::GotoTerminal {\n+ TerminalValue::Goto(hir::GotoTerminal {\n block: fallthrough_block.id,\n kind: GotoKind::Break,\n })\n });\n \n let test = lower_expression_to_temporary(env, builder, test);\n- let terminal = TerminalValue::IfTerminal(hir::IfTerminal {\n+ let terminal = TerminalValue::If(hir::IfTerminal {\n test,\n consequent: consequent_block,\n alternate: alternate_block,\n@@ -183,6 +184,80 @@ fn lower_statement<'a>(\n });\n builder.terminate_with_fallthrough(terminal, fallthrough_block);\n }\n+ Statement::ForStatement(stmt) => {\n+ let ForStatement {\n+ init,\n+ test,\n+ update,\n+ body,\n+ ..\n+ } = *stmt;\n+\n+ \/\/ Block for the loop's test condition\n+ let test_block = builder.reserve(BlockKind::Loop);\n+\n+ \/\/ Block for code following the loop\n+ let fallthrough_block = builder.reserve(BlockKind::Block);\n+\n+ let init_block = builder.enter(BlockKind::Loop, |builder| {\n+ if let Some(ForInit::VariableDeclaration(decl)) = init {\n+ lower_statement(env, builder, Statement::VariableDeclaration(decl), None)\n+ .unwrap();\n+ TerminalValue::Goto(hir::GotoTerminal {\n+ block: test_block.id,\n+ kind: GotoKind::Break,\n+ })\n+ } else {\n+ panic!(\"Expected for statement to have a variable declaration initializer\")\n+ }\n+ });\n+\n+ let update_block = update.map(|update| {\n+ builder.enter(BlockKind::Loop, |builder| {\n+ lower_expression_to_temporary(env, builder, update);\n+ TerminalValue::Goto(hir::GotoTerminal {\n+ block: test_block.id,\n+ kind: GotoKind::Break,\n+ })\n+ })\n+ });\n+\n+ let body_block = builder.enter(BlockKind::Block, |builder| {\n+ let loop_ = LoopScope {\n+ label,\n+ continue_block: update_block.unwrap_or(test_block.id),\n+ break_block: fallthrough_block.id,\n+ };\n+ builder.enter_loop(loop_, |builder| {\n+ lower_statement(env, builder, body, None).unwrap();\n+ TerminalValue::Goto(hir::GotoTerminal {\n+ block: update_block.unwrap_or(test_block.id),\n+ kind: GotoKind::Continue,\n+ })\n+ })\n+ });\n+\n+ let terminal = TerminalValue::For(ForTerminal {\n+ body: body_block,\n+ init: init_block,\n+ test: test_block.id,\n+ fallthrough: fallthrough_block.id,\n+ update: update_block,\n+ });\n+ builder.terminate_with_fallthrough(terminal, test_block);\n+\n+ if let Some(test) = test {\n+ let test_value = lower_expression_to_temporary(env, builder, test);\n+ let terminal = TerminalValue::Branch(BranchTerminal {\n+ test: test_value,\n+ consequent: body_block,\n+ alternate: fallthrough_block.id,\n+ });\n+ builder.terminate_with_fallthrough(terminal, fallthrough_block);\n+ } else {\n+ panic!(\"Expected for statement to have a tesst block\");\n+ }\n+ }\n _ => todo!(\"Lower {stmt:#?}\"),\n }\n Ok(())\n@@ -240,6 +315,7 @@ fn lower_expression<'a>(\n .collect_in(env.allocator);\n InstructionValue::Array(hir::Array { elements })\n }\n+\n ExpressionLike::AssignmentExpression(expr) => match expr.operator {\n estree::AssignmentOperator::Equals => {\n let right = lower_expression_to_temporary(env, builder, expr.right);\n@@ -248,6 +324,22 @@ fn lower_expression<'a>(\n _ => todo!(\"lower assignment expr {:#?}\", expr),\n },\n \n+ ExpressionLike::BinaryExpression(expr) => {\n+ let BinaryExpression {\n+ left,\n+ operator,\n+ right,\n+ ..\n+ } = *expr;\n+ let left = lower_expression_to_temporary(env, builder, left);\n+ let right = lower_expression_to_temporary(env, builder, right);\n+ InstructionValue::Binary(hir::Binary {\n+ left,\n+ operator,\n+ right,\n+ })\n+ }\n+\n \/\/ Cases that cannot appear in expression position but which are included in ExpressionLike\n \/\/ to make serialization easier\n ExpressionLike::SpreadElement(_) => {\ndiff --git a\/compiler\/forget\/crates\/build-hir\/src\/builder.rs b\/compiler\/forget\/crates\/build-hir\/src\/builder.rs\nindex fb0992ee9b..3dc358cbd5 100644\n--- a\/compiler\/forget\/crates\/build-hir\/src\/builder.rs\n+++ b\/compiler\/forget\/crates\/build-hir\/src\/builder.rs\n@@ -1,4 +1,4 @@\n-use bumpalo::collections::Vec;\n+use bumpalo::collections::{String, Vec};\n use std::{cell::RefCell, collections::HashSet, rc::Rc};\n \n use hir::{\n@@ -27,6 +27,8 @@ pub(crate) struct Builder<'a> {\n wip: WipBlock<'a>,\n \n id_gen: InstructionIdGenerator,\n+\n+ scopes: Vec<'a, ControlFlowScope<'a>>,\n }\n \n pub(crate) struct WipBlock<'a> {\n@@ -35,6 +37,48 @@ pub(crate) struct WipBlock<'a> {\n pub instructions: Vec<'a, Instruction<'a>>,\n }\n \n+pub(crate) enum Binding<'a> {\n+ Local(Identifier<'a>),\n+ Module(Identifier<'a>),\n+ Global,\n+}\n+\n+#[derive(Clone, PartialEq, Eq, Debug)]\n+enum ControlFlowScope<'a> {\n+ Loop(LoopScope<'a>),\n+ \/\/ Switch(SwitchScope<'a>),\n+ Label(LabelScope<'a>),\n+}\n+\n+#[derive(Clone, PartialEq, Eq, Debug)]\n+pub(crate) struct LoopScope<'a> {\n+ pub label: Option>,\n+ pub continue_block: BlockId,\n+ pub break_block: BlockId,\n+}\n+\n+#[derive(Clone, PartialEq, Eq, Debug)]\n+pub(crate) struct LabelScope<'a> {\n+ pub label: String<'a>,\n+ pub block: BlockId,\n+}\n+\n+impl<'a> ControlFlowScope<'a> {\n+ fn label(&self) -> Option<&String<'a>> {\n+ match self {\n+ Self::Loop(scope) => scope.label.as_ref(),\n+ Self::Label(scope) => Some(&scope.label),\n+ }\n+ }\n+\n+ fn break_block(&self) -> BlockId {\n+ match self {\n+ Self::Loop(scope) => scope.break_block,\n+ Self::Label(scope) => scope.block,\n+ }\n+ }\n+}\n+\n impl<'a> Builder<'a> {\n pub(crate) fn new(environment: &'a Environment<'a>) -> Self {\n let entry = environment.next_block_id();\n@@ -49,6 +93,7 @@ impl<'a> Builder<'a> {\n entry,\n wip: current,\n id_gen: InstructionIdGenerator::new(),\n+ scopes: Vec::new_in(&environment.allocator),\n }\n }\n \n@@ -155,6 +200,17 @@ impl<'a> Builder<'a> {\n );\n }\n \n+ pub(crate) fn enter_loop(&mut self, scope: LoopScope<'a>, f: F) -> TerminalValue<'a>\n+ where\n+ F: FnOnce(&mut Self) -> TerminalValue<'a>,\n+ {\n+ self.scopes.push(ControlFlowScope::Loop(scope.clone()));\n+ let terminal = f(self);\n+ let last = self.scopes.pop().unwrap();\n+ assert_eq!(last, ControlFlowScope::Loop(scope));\n+ terminal\n+ }\n+\n \/\/\/ Returns a new temporary identifier\n pub(crate) fn make_temporary(&self) -> hir::Identifier<'a> {\n hir::Identifier {\n@@ -173,9 +229,21 @@ impl<'a> Builder<'a> {\n \/\/\/ provided but cannot be resolved.\n pub(crate) fn resolve_break(\n &self,\n- _label: Option<&estree::Identifier>,\n+ label: Option<&estree::Identifier>,\n ) -> Result {\n- todo!()\n+ for scope in self.scopes.iter().rev() {\n+ match (label, scope.label()) {\n+ \/\/ If this is an unlabeled break, return the most recent break target\n+ (None, _) => return Ok(scope.break_block()),\n+ \/\/ If the break is labeled and matches the current scope, return its break target\n+ (Some(label), Some(scope_label)) if &label.name == scope_label => {\n+ return Ok(scope.break_block());\n+ }\n+ \/\/ Otherwise keep searching\n+ _ => continue,\n+ }\n+ }\n+ Err(())\n }\n \n \/\/\/ Resolves the target for the given continue label (if present), or returns the default\n@@ -183,9 +251,36 @@ impl<'a> Builder<'a> {\n \/\/\/ provided but cannot be resolved.\n pub(crate) fn resolve_continue(\n &self,\n- _label: Option<&estree::Identifier>,\n+ label: Option<&estree::Identifier>,\n ) -> Result {\n- todo!()\n+ for scope in self.scopes.iter().rev() {\n+ match scope {\n+ ControlFlowScope::Loop(scope) => {\n+ match (label, &scope.label) {\n+ \/\/ If this is an unlabeled continue, return the first matching loop\n+ (None, _) => return Ok(scope.continue_block),\n+ \/\/ If the continue is labeled and matches the current scope, return its continue target\n+ (Some(label), Some(scope_label))\n+ if label.name.as_str() == scope_label.as_str() =>\n+ {\n+ return Ok(scope.continue_block);\n+ }\n+ \/\/ Otherwise keep searching\n+ _ => continue,\n+ }\n+ }\n+ _ => {\n+ match (label, scope.label()) {\n+ (Some(label), Some(scope_label)) if label.name.as_str() == scope_label => {\n+ \/\/ Error, the continue referred to a label that is not a loop\n+ return Err(());\n+ }\n+ _ => continue,\n+ }\n+ }\n+ }\n+ }\n+ Err(())\n }\n \n pub(crate) fn resolve_binding(\n@@ -206,12 +301,6 @@ impl<'a> Builder<'a> {\n }\n }\n \n-pub(crate) enum Binding<'a> {\n- Local(Identifier<'a>),\n- Module(Identifier<'a>),\n- Global,\n-}\n-\n \/\/\/ Modifies the HIR to put the blocks in reverse postorder, with predecessors before\n \/\/\/ successors (except for the case of loops)\n fn reverse_postorder_blocks<'a>(hir: &mut HIR<'a>) {\n@@ -230,20 +319,24 @@ fn reverse_postorder_blocks<'a>(hir: &mut HIR<'a>) {\n let block = hir.block(block_id);\n let terminal = &block.terminal;\n match &terminal.value {\n- TerminalValue::IfTerminal(terminal) => {\n+ TerminalValue::Branch(terminal) => {\n+ visit(terminal.alternate, hir, visited, postorder);\n+ visit(terminal.consequent, hir, visited, postorder);\n+ }\n+ TerminalValue::If(terminal) => {\n visit(terminal.alternate, hir, visited, postorder);\n visit(terminal.consequent, hir, visited, postorder);\n }\n- TerminalValue::ForTerminal(terminal) => {\n+ TerminalValue::For(terminal) => {\n visit(terminal.init, hir, visited, postorder);\n }\n- TerminalValue::DoWhileTerminal(terminal) => {\n+ TerminalValue::DoWhile(terminal) => {\n visit(terminal.body, hir, visited, postorder);\n }\n- TerminalValue::GotoTerminal(terminal) => {\n+ TerminalValue::Goto(terminal) => {\n visit(terminal.block, hir, visited, postorder);\n }\n- TerminalValue::ReturnTerminal(..) => { \/* no-op *\/ }\n+ TerminalValue::Return(..) => { \/* no-op *\/ }\n }\n postorder.push(block_id);\n }\n@@ -263,7 +356,7 @@ fn remove_unreachable_for_updates<'a>(hir: &mut HIR<'a>) {\n let block_ids: HashSet = hir.blocks.keys().cloned().collect();\n \n for block in hir.blocks.values_mut() {\n- if let TerminalValue::ForTerminal(terminal) = &mut block.terminal.value {\n+ if let TerminalValue::For(terminal) = &mut block.terminal.value {\n if let Some(update) = terminal.update {\n if !block_ids.contains(&update) {\n terminal.update = None;\n@@ -297,9 +390,9 @@ fn remove_unreachable_do_while_statements<'a>(hir: &mut HIR<'a>) {\n let block_ids: HashSet = hir.blocks.keys().cloned().collect();\n \n for block in hir.blocks.values_mut() {\n- if let TerminalValue::DoWhileTerminal(terminal) = &mut block.terminal.value {\n+ if let TerminalValue::DoWhile(terminal) = &mut block.terminal.value {\n if !block_ids.contains(&terminal.test) {\n- block.terminal.value = TerminalValue::GotoTerminal(hir::GotoTerminal {\n+ block.terminal.value = TerminalValue::Goto(hir::GotoTerminal {\n block: terminal.body,\n kind: GotoKind::Break,\n });\n@@ -353,7 +446,7 @@ fn mark_predecessors<'a>(hir: &mut HIR<'a>) {\n \n fn invariant(cond: bool, f: F) -> Result<(), Diagnostic>\n where\n- F: FnOnce() -> String,\n+ F: FnOnce() -> std::string::String,\n {\n if !cond {\n let msg = f();\ndiff --git a\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs b\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\nindex bfcbcff00c..4cb6adc517 100644\n--- a\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/estree-swc\/src\/lib.rs\n@@ -6,8 +6,8 @@ use swc_core::common::errors::Handler;\n use swc_core::common::source_map::Pos;\n use swc_core::common::{FileName, FilePathMapping, Mark, SourceMap, Span, SyntaxContext, GLOBALS};\n use swc_core::ecma::ast::{\n- AssignOp, BinaryOp, BlockStmt, Decl, EsVersion, Expr, Ident, Lit, MemberExpr, ModuleItem, Pat,\n- PatOrExpr, Program, Stmt, UnaryOp, VarDecl, VarDeclKind, VarDeclOrExpr,\n+ AssignOp, BinaryOp, BlockStmt, Decl, EsVersion, Expr, Ident, Lit, MemberExpr, MemberProp,\n+ ModuleItem, Pat, PatOrExpr, Program, Stmt, UnaryOp, VarDecl, VarDeclKind, VarDeclOrExpr,\n };\n use swc_core::ecma::parser::Syntax;\n use swc_core::ecma::transforms::base::resolver;\n@@ -366,6 +366,9 @@ fn convert_expression(cx: &Context, expr: &Expr) -> estree::ExpressionLike {\n range: convert_span(&expr.span),\n }))\n }\n+ Expr::Member(expr) => {\n+ estree::ExpressionLike::MemberExpression(Box::new(convert_member_expression(cx, expr)))\n+ }\n _ => todo!(\"translate expression {:#?}\", expr),\n }\n }\n@@ -376,22 +379,40 @@ fn convert_assignment_target(cx: &Context, target: &PatOrExpr) -> estree::Assign\n estree::AssignmentTarget::Pattern(Box::new(convert_pattern(cx, target)))\n }\n PatOrExpr::Expr(target) => {\n- if let Expr::Member(target) = target.as_ref() {\n- estree::AssignmentTarget::MemberExpression(Box::new(convert_member_expression(\n- cx, target,\n- )))\n- } else {\n- panic!(\n- \"Invalid input, expected either a pattern or member expression, got {:#?}\",\n- target\n- )\n+ match target.as_ref() {\n+ Expr::Member(target) => estree::AssignmentTarget::MemberExpression(Box::new(\n+ convert_member_expression(cx, target),\n+ )),\n+ Expr::Ident(target) => estree::AssignmentTarget::Pattern(Box::new(\n+ estree::Pattern::Identifier(Box::new(convert_identifier(cx, target))),\n+ )),\n+ _ => {\n+ panic!(\"Expected assignment target to be member expression or identifier, got {:#?}\", target)\n+ }\n }\n }\n }\n }\n \n-fn convert_member_expression(_cx: &Context, _expr: &MemberExpr) -> estree::MemberExpression {\n- todo!(\"convert member expression\")\n+fn convert_member_expression(cx: &Context, expr: &MemberExpr) -> estree::MemberExpression {\n+ let (is_computed, property) = match &expr.prop {\n+ MemberProp::Ident(prop) => (\n+ false,\n+ estree::ExpressionLike::Identifier(Box::new(convert_identifier(cx, prop))),\n+ ),\n+ MemberProp::Computed(prop) => (true, convert_expression(cx, &prop.expr)),\n+ _ => {\n+ panic!(\"PrivateName member expression properties are not supported\")\n+ }\n+ };\n+ estree::MemberExpression {\n+ object: convert_expression(cx, &expr.obj),\n+ property,\n+ is_computed,\n+ is_optional: false,\n+ loc: None,\n+ range: convert_span(&expr.span),\n+ }\n }\n \n fn convert_unary_operator(op: UnaryOp) -> estree::UnaryOperator {\ndiff --git a\/compiler\/forget\/crates\/estree\/src\/lib.rs b\/compiler\/forget\/crates\/estree\/src\/lib.rs\nindex 22111383e3..a467714bab 100644\n--- a\/compiler\/forget\/crates\/estree\/src\/lib.rs\n+++ b\/compiler\/forget\/crates\/estree\/src\/lib.rs\n@@ -1,6 +1,6 @@\n use serde::{Deserialize, Serialize};\n use static_assertions::assert_eq_size;\n-use std::num::NonZeroU32;\n+use std::{fmt::Display, num::NonZeroU32};\n \n #[derive(Serialize, Deserialize, Debug)]\n pub struct SourceLocation {\n@@ -689,6 +689,17 @@ pub enum BinaryOperator {\n Instanceof,\n }\n \n+impl Display for BinaryOperator {\n+ fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {\n+ let name = match self {\n+ Self::Plus => \"+\",\n+ Self::LessThan => \"<\",\n+ _ => todo!(\"display for operator: {:#?}\", self),\n+ };\n+ f.write_str(name)\n+ }\n+}\n+\n #[derive(Serialize, Deserialize, Debug)]\n pub struct CallExpression {\n #[serde(rename = \"optional\")]\ndiff --git a\/compiler\/forget\/crates\/fixtures\/tests\/fixtures\/for-statement.js b\/compiler\/forget\/crates\/fixtures\/tests\/fixtures\/for-statement.js\nnew file mode 100644\nindex 0000000000..180dd4d759\n--- \/dev\/null\n+++ b\/compiler\/forget\/crates\/fixtures\/tests\/fixtures\/for-statement.js\n@@ -0,0 +1,7 @@\n+function foo() {\n+ let x = 0;\n+ for (let i = 0; i < 10; i = i + 1) {\n+ x = x + i;\n+ }\n+ return x;\n+}\ndiff --git a\/compiler\/forget\/crates\/fixtures\/tests\/snapshots\/fixtures_test__fixtures@for-statement.js.snap b\/compiler\/forget\/crates\/fixtures\/tests\/snapshots\/fixtures_test__fixtures@for-statement.js.snap\nnew file mode 100644\nindex 0000000000..ee9c1aef84\n--- \/dev\/null\n+++ b\/compiler\/forget\/crates\/fixtures\/tests\/snapshots\/fixtures_test__fixtures@for-statement.js.snap\n@@ -0,0 +1,46 @@\n+---\n+source: crates\/fixtures\/tests\/fixtures_test.rs\n+expression: \"format!(\\\"Input:\\\\n{input}\\\\n\\\\nOutput:\\\\n{output}\\\")\"\n+input_file: crates\/fixtures\/tests\/fixtures\/for-statement.js\n+---\n+Input:\n+function foo() {\n+ let x = 0;\n+ for (let i = 0; i < 10; i = i + 1) {\n+ x = x + i;\n+ }\n+ return x;\n+}\n+\n+\n+Output:\n+entry bb0\n+bb0\n+ [0] unknown $0 = 0\n+ [1] unknown $2 = StoreLocal Let unknown x$1 = unknown $0\n+ [2] For init=bb3 test=bb1 update=bb4 body=bb5 fallthrough=bb2\n+bb3\n+ [3] unknown $3 = 0\n+ [4] unknown $5 = StoreLocal Let unknown i$4 = unknown $3\n+ [5] Goto bb1\n+bb1\n+ [6] unknown $14 = LoadLocal unknown i$4\n+ [7] unknown $15 = 10\n+ [8] unknown $16 = Binary unknown $14 < unknown $15\n+ [9] Branch unknown $16 consequent=bb5 alternate=bb2\n+bb5\n+ [10] unknown $10 = LoadLocal unknown x$1\n+ [11] unknown $11 = LoadLocal unknown i$4\n+ [12] unknown $12 = Binary unknown $10 + unknown $11\n+ [13] unknown $13 = StoreLocal Reassign unknown x$1 = unknown $12\n+ [14] Goto bb4\n+bb4\n+ [15] unknown $6 = LoadLocal unknown i$4\n+ [16] unknown $7 = 1\n+ [17] unknown $8 = Binary unknown $6 + unknown $7\n+ [18] unknown $9 = StoreLocal Reassign unknown i$4 = unknown $8\n+ [19] Goto bb1\n+bb2\n+ [20] unknown $17 = LoadLocal unknown x$1\n+ [21] Return unknown $17\n+\ndiff --git a\/compiler\/forget\/crates\/hir\/src\/instruction.rs b\/compiler\/forget\/crates\/hir\/src\/instruction.rs\nindex 02e49d80e0..75dddb5ea6 100644\n--- a\/compiler\/forget\/crates\/hir\/src\/instruction.rs\n+++ b\/compiler\/forget\/crates\/hir\/src\/instruction.rs\n@@ -1,6 +1,7 @@\n use std::{cell::RefCell, fmt::Display, rc::Rc};\n \n use bumpalo::collections::{String, Vec};\n+use estree::BinaryOperator;\n \n use crate::{IdentifierId, InstructionId, ScopeId, Type};\n \n@@ -15,7 +16,7 @@ pub struct Instruction<'a> {\n pub enum InstructionValue<'a> {\n Array(Array<'a>),\n \/\/ Await(Await<'a>),\n- \/\/ Binary(Binary<'a>),\n+ Binary(Binary<'a>),\n \/\/ Call(Call<'a>),\n \/\/ ComputedDelete(ComputedDelete<'a>),\n \/\/ ComputedLoad(ComputedLoad<'a>),\n@@ -59,6 +60,13 @@ pub enum ArrayElement<'a> {\n Spread(Place<'a>),\n }\n \n+#[derive(Debug)]\n+pub struct Binary<'a> {\n+ pub left: Place<'a>,\n+ pub operator: BinaryOperator,\n+ pub right: Place<'a>,\n+}\n+\n #[derive(Debug)]\n pub struct Primitive<'a> {\n pub value: PrimitiveValue<'a>,\ndiff --git a\/compiler\/forget\/crates\/hir\/src\/print.rs b\/compiler\/forget\/crates\/hir\/src\/print.rs\nindex 15fb1407ca..3bd83493fa 100644\n--- a\/compiler\/forget\/crates\/hir\/src\/print.rs\n+++ b\/compiler\/forget\/crates\/hir\/src\/print.rs\n@@ -90,6 +90,12 @@ impl<'a> Print for InstructionValue<'a> {\n write!(out, \"DeclareLocal \")?;\n value.lvalue.print(out)?;\n }\n+ InstructionValue::Binary(value) => {\n+ write!(out, \"Binary \")?;\n+ value.left.print(out)?;\n+ write!(out, \" {} \", value.operator)?;\n+ value.right.print(out)?;\n+ }\n _ => write!(out, \"{:?}\", self)?,\n }\n Ok(())\n@@ -146,14 +152,14 @@ impl<'a> Print for Terminal<'a> {\n impl<'a> Print for TerminalValue<'a> {\n fn print(&self, out: &mut impl Write) -> Result {\n match self {\n- TerminalValue::ReturnTerminal(terminal) => {\n+ TerminalValue::Return(terminal) => {\n write!(out, \"Return \")?;\n terminal.value.print(out)?;\n }\n- TerminalValue::GotoTerminal(terminal) => {\n+ TerminalValue::Goto(terminal) => {\n write!(out, \"Goto {}\", terminal.block)?;\n }\n- TerminalValue::IfTerminal(terminal) => {\n+ TerminalValue::If(terminal) => {\n write!(out, \"If \")?;\n terminal.test.print(out)?;\n write!(\n@@ -167,6 +173,29 @@ impl<'a> Print for TerminalValue<'a> {\n }\n )?;\n }\n+ TerminalValue::Branch(terminal) => {\n+ write!(out, \"Branch \")?;\n+ terminal.test.print(out)?;\n+ write!(\n+ out,\n+ \" consequent={} alternate={}\",\n+ terminal.consequent, terminal.alternate,\n+ )?;\n+ }\n+ TerminalValue::For(terminal) => {\n+ write!(\n+ out,\n+ \"For init={} test={} update={} body={} fallthrough={}\",\n+ terminal.init,\n+ terminal.test,\n+ match terminal.update {\n+ Some(fallthrough) => format!(\"{fallthrough}\"),\n+ None => \"\".to_string(),\n+ },\n+ terminal.body,\n+ terminal.fallthrough,\n+ )?;\n+ }\n _ => write!(out, \"{:?}\", self)?,\n }\n Ok(())\ndiff --git a\/compiler\/forget\/crates\/hir\/src\/terminal.rs b\/compiler\/forget\/crates\/hir\/src\/terminal.rs\nindex 2be31a59ca..5d257352be 100644\n--- a\/compiler\/forget\/crates\/hir\/src\/terminal.rs\n+++ b\/compiler\/forget\/crates\/hir\/src\/terminal.rs\n@@ -10,22 +10,22 @@ pub struct Terminal<'a> {\n \n #[derive(Debug)]\n pub enum TerminalValue<'a> {\n- \/\/ BranchTerminal(BranchTerminal),\n- DoWhileTerminal(DoWhileTerminal),\n- \/\/ ForOfTerminal(ForOfTerminal),\n- ForTerminal(ForTerminal),\n- GotoTerminal(GotoTerminal),\n- IfTerminal(IfTerminal<'a>),\n- \/\/ LabelTerminal(LabelTerminal),\n- \/\/ LogicalTerminal(LogicalTerminal),\n- \/\/ OptionalTerminal(OptionalTerminal),\n- ReturnTerminal(ReturnTerminal<'a>),\n- \/\/ SequenceTerminal(SequenceTerminal),\n- \/\/ SwitchTerminal(SwitchTerminal),\n- \/\/ TernaryTerminal(TernaryTerminal),\n- \/\/ ThrowTerminal(ThrowTerminal),\n- \/\/ UnsupportedTerminal(UnsupportedTerminal),\n- \/\/ WhileTerminal(WhileTerminal),\n+ Branch(BranchTerminal<'a>),\n+ DoWhile(DoWhileTerminal),\n+ \/\/ ForOf(ForOfTerminal),\n+ For(ForTerminal),\n+ Goto(GotoTerminal),\n+ If(IfTerminal<'a>),\n+ \/\/ Label(LabelTerminal),\n+ \/\/ Logical(LogicalTerminal),\n+ \/\/ Optional(OptionalTerminal),\n+ Return(ReturnTerminal<'a>),\n+ \/\/ Sequence(SequenceTerminal),\n+ \/\/ Switch(SwitchTerminal),\n+ \/\/ Ternary(TernaryTerminal),\n+ \/\/ Throw(ThrowTerminal),\n+ \/\/ Unsupported(UnsupportedTerminal),\n+ \/\/ While(WhileTerminal),\n }\n \n impl<'a> TerminalValue<'a> {\n@@ -34,43 +34,53 @@ impl<'a> TerminalValue<'a> {\n F: Fn(BlockId) -> Option,\n {\n match self {\n- Self::IfTerminal(terminal) => {\n+ Self::If(terminal) => {\n terminal.fallthrough = match terminal.fallthrough {\n Some(fallthrough) => f(fallthrough),\n _ => None,\n }\n }\n- Self::DoWhileTerminal(DoWhileTerminal { fallthrough, .. })\n- | Self::ForTerminal(ForTerminal { fallthrough, .. }) => {\n+ Self::DoWhile(DoWhileTerminal { fallthrough, .. })\n+ | Self::For(ForTerminal { fallthrough, .. }) => {\n \/\/ statically detect if fallthrough is changed to Option so\n \/\/ that we can update to map the fallthrough w f()\n let _: BlockId = *fallthrough;\n }\n- Self::GotoTerminal(_) | Self::ReturnTerminal(_) => {}\n+ Self::Branch(_) | Self::Goto(_) | Self::Return(_) => {}\n }\n }\n \n pub fn successors(&self) -> Vec {\n match self {\n- Self::IfTerminal(terminal) => {\n+ Self::If(terminal) => {\n vec![terminal.consequent, terminal.alternate]\n }\n- Self::ForTerminal(terminal) => {\n+ Self::Branch(terminal) => {\n+ vec![terminal.consequent, terminal.alternate]\n+ }\n+ Self::For(terminal) => {\n vec![terminal.init]\n }\n- Self::DoWhileTerminal(terminal) => {\n+ Self::DoWhile(terminal) => {\n vec![terminal.body]\n }\n- Self::GotoTerminal(terminal) => {\n+ Self::Goto(terminal) => {\n vec![terminal.block]\n }\n- Self::ReturnTerminal(_) => {\n+ Self::Return(_) => {\n vec![]\n }\n }\n }\n }\n \n+#[derive(Debug)]\n+pub struct BranchTerminal<'a> {\n+ pub test: Place<'a>,\n+ pub consequent: BlockId,\n+ pub alternate: BlockId,\n+}\n+\n #[derive(Debug)]\n pub struct GotoTerminal {\n pub block: BlockId,\n","body":"Implements support for `ForStatement` from swc -> estree -> hir, flushing out \nmore of the HIR representation and porting pieces from HIRBuilder as necessary."}

dillon1000/react

Files changed