{"body":"","patch":"diff --git a\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs b\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\nindex 2cefe34e2c..c1cf756fc1 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/instruction.rs\n@@ -14,7 +14,7 @@ pub struct Instruction {\n }\n \n impl Instruction {\n- pub fn each_identifier_store(&mut self, mut f: F) -> ()\n+ pub fn each_lvalue(&mut self, mut f: F) -> ()\n where\n F: FnMut(&mut IdentifierOperand) -> (),\n {\n@@ -29,7 +29,7 @@ impl Instruction {\n f(&mut instr.lvalue.identifier);\n }\n InstructionValue::Destructure(instr) => {\n- instr.pattern.each_operand(f);\n+ instr.pattern.each_operand(&mut f);\n }\n InstructionValue::Array(_)\n | InstructionValue::Binary(_)\n@@ -42,9 +42,10 @@ impl Instruction {\n | InstructionValue::JSXElement(_)\n | InstructionValue::Tombstone => {}\n }\n+ f(&mut self.lvalue);\n }\n \n- pub fn try_each_identifier_store(&mut self, mut f: F) -> Result<(), E>\n+ pub fn try_each_lvalue(&mut self, mut f: F) -> Result<(), E>\n where\n F: FnMut(&mut IdentifierOperand) -> Result<(), E>,\n {\n@@ -58,7 +59,7 @@ impl Instruction {\n InstructionValue::StoreLocal(instr) => {\n f(&mut instr.lvalue.identifier)?;\n }\n- InstructionValue::Destructure(instr) => instr.pattern.try_each_operand(f)?,\n+ InstructionValue::Destructure(instr) => instr.pattern.try_each_operand(&mut f)?,\n InstructionValue::Array(_)\n | InstructionValue::Binary(_)\n | InstructionValue::Call(_)\n@@ -70,17 +71,11 @@ impl Instruction {\n | InstructionValue::JSXElement(_)\n | InstructionValue::Tombstone => {}\n }\n+ f(&mut self.lvalue)?;\n Ok(())\n }\n \n- pub fn each_identifier_load(&mut self, f: F) -> ()\n- where\n- F: FnMut(&mut IdentifierOperand) -> (),\n- {\n- self.each_operand(f);\n- }\n-\n- pub fn each_operand(&mut self, mut f: F) -> ()\n+ pub fn each_rvalue(&mut self, mut f: F) -> ()\n where\n F: FnMut(&mut IdentifierOperand) -> (),\n {\n@@ -281,7 +276,7 @@ pub enum DestructurePattern {\n }\n \n impl DestructurePattern {\n- pub fn try_each_operand(&mut self, mut f: F) -> Result<(), E>\n+ pub fn try_each_operand(&mut self, f: &mut F) -> Result<(), E>\n where\n F: FnMut(&mut IdentifierOperand) -> Result<(), E>,\n {\n@@ -308,7 +303,7 @@ impl DestructurePattern {\n }\n Ok(())\n }\n- pub fn each_operand(&mut self, mut f: F) -> ()\n+ pub fn each_operand(&mut self, f: &mut F) -> ()\n where\n F: FnMut(&mut IdentifierOperand) -> (),\n {\ndiff --git a\/compiler\/forget\/crates\/forget_ssa\/src\/eliminate_redundant_phis.rs b\/compiler\/forget\/crates\/forget_ssa\/src\/eliminate_redundant_phis.rs\nindex 8d90721291..30bb45d092 100644\n--- a\/compiler\/forget\/crates\/forget_ssa\/src\/eliminate_redundant_phis.rs\n+++ b\/compiler\/forget\/crates\/forget_ssa\/src\/eliminate_redundant_phis.rs\n@@ -70,8 +70,8 @@ pub fn eliminate_redundant_phis(env: &Environment, fun: &mut Function) {\n \n for instr_ix in block.instructions.iter() {\n let instr = &mut hir.instructions[usize::from(*instr_ix)];\n- instr.each_identifier_store(|store| rewrite(&rewrites, &mut store.identifier));\n- instr.each_identifier_load(|load| rewrite(&rewrites, &mut load.identifier));\n+ instr.each_lvalue(|lvalue| rewrite(&rewrites, &mut lvalue.identifier));\n+ instr.each_rvalue(|rvalue| rewrite(&rewrites, &mut rvalue.identifier));\n \n if let InstructionValue::Function(fun) = &mut instr.value {\n for context_identifier in &mut fun.lowered_function.context {\ndiff --git a\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs b\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\nindex 336974ea59..82050b0c52 100644\n--- a\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\n+++ b\/compiler\/forget\/crates\/forget_ssa\/src\/enter.rs\n@@ -1,8 +1,7 @@\n use std::cell::RefCell;\n-use std::process::id;\n use std::rc::Rc;\n \n-use forget_diagnostics::{invariant, Diagnostic};\n+use forget_diagnostics::Diagnostic;\n use forget_hir::{\n BasicBlock, BlockId, BlockRewriter, BlockRewriterAction, Blocks, Environment, Function,\n Identifier, IdentifierData, IdentifierId, IdentifierOperand, InstructionValue, MutableRange,\n@@ -52,9 +51,8 @@ fn visit_instructions<'e>(\n builder.start_block(&block);\n for instr_ix in &block.instructions {\n let instr = &mut instructions[usize::from(*instr_ix)];\n- instr.each_identifier_load(|load| builder.visit_load(load));\n- instr.try_each_identifier_store(|store| builder.visit_store(store))?;\n- builder.visit_store(&mut instr.lvalue)?;\n+ instr.each_rvalue(|rvalue| builder.visit_load(rvalue));\n+ instr.try_each_lvalue(|lvalue| builder.visit_store(lvalue))?;\n \n if let InstructionValue::Function(fun) = &mut instr.value {\n \/\/ Lookup each of the context variables referenced in the function\n@@ -158,14 +156,12 @@ impl<'e> Builder<'e> {\n \n fn visit_store(&mut self, lvalue: &mut IdentifierOperand) -> Result<(), Diagnostic> {\n let old_identifier = &lvalue.identifier;\n- \/\/ TODO: use Result (?)\n- invariant(!self.unknown.contains(&old_identifier.id), || {\n- Diagnostic::invariant(\n+ if self.unknown.contains(&old_identifier.id) {\n+ return Err(Diagnostic::invariant(\n \"EnterSSA: Expected identifier to be defined before being used\",\n None,\n- )\n- })?;\n-\n+ ));\n+ }\n if self.context.contains(&old_identifier.id) {\n let new_identifier = self.get_id_at(self.current, old_identifier);\n lvalue.identifier = new_identifier;\n","parents":["e2485341846fec767f68b5c7c25b277699962054"],"files":[{"status":"M","path":"compiler\/forget\/crates\/forget_hir\/src\/instruction.rs"},{"status":"M","path":"compiler\/forget\/crates\/forget_ssa\/src\/eliminate_redundant_phis.rs"},{"status":"M","path":"compiler\/forget\/crates\/forget_ssa\/src\/enter.rs"}],"commit":{"shortRevision":"57f648009c","authorEmail":"joesavona@fb.com","subject":"[rust] Cleanup visitors","revision":"57f648009cea9ce84ed3480ba5ca50794e680b02","authorName":"Joe Savona","authoredAt":"2023-08-14T09:54:29-07:00"}}

dillon1000/react

Files changed