{"commit":{"authoredAt":"2023-07-14T22:47:21+09:00","shortRevision":"bac24ffd78","subject":"[rust] Use new block helper for more passes","authorEmail":"joesavona@fb.com","revision":"bac24ffd78129e6f7dce2b22d7ba44dd1978d0b0","authorName":"Joe Savona"},"patch":"diff --git a\/compiler\/forget\/crates\/forget_hir\/src\/function.rs b\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\nindex aa3de30879..8a4558e030 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/function.rs\n@@ -62,7 +62,7 @@ impl<'a> Blocks<'a> {\n self.data.keys().cloned().collect()\n }\n \n- pub fn take(&mut self, id: BlockId) -> Box> {\n+ pub fn remove(&mut self, id: BlockId) -> Box> {\n self.data.remove(&id).unwrap().unwrap()\n }\n \n@@ -146,7 +146,26 @@ impl<'blocks, 'a> BlockRewriter<'blocks, 'a> {\n }\n }\n \n- pub fn each_block(&mut self, mut f: F) -> Result<(), Diagnostic>\n+ pub fn each_block(&mut self, mut f: F) -> ()\n+ where\n+ F: FnMut(Box>, &mut Self) -> BlockRewriterAction<'a>,\n+ {\n+ let keys = self.blocks.block_ids();\n+ for block_id in keys {\n+ self.current = block_id;\n+ let block = self.blocks.data.get_mut(&block_id).unwrap().take().unwrap();\n+ match f(block, self) {\n+ BlockRewriterAction::Keep(block) => {\n+ self.blocks.data.insert(block_id, Some(block));\n+ }\n+ BlockRewriterAction::Remove => {\n+ self.blocks.data.remove(&block_id);\n+ }\n+ }\n+ }\n+ }\n+\n+ pub fn try_each_block(&mut self, mut f: F) -> Result<(), Diagnostic>\n where\n F: FnMut(Box>, &mut Self) -> Result, Diagnostic>,\n {\n@@ -159,13 +178,18 @@ impl<'blocks, 'a> BlockRewriter<'blocks, 'a> {\n self.blocks.data.insert(block_id, Some(block));\n }\n BlockRewriterAction::Remove => {\n- \/\/ nothing to do, already removed from the blocks\n+ self.blocks.data.remove(&block_id);\n }\n }\n }\n Ok(())\n }\n \n+ pub fn contains(&self, block_id: BlockId) -> bool {\n+ assert_ne!(block_id, self.current);\n+ self.blocks.data.contains_key(&block_id)\n+ }\n+\n pub fn block(&self, block_id: BlockId) -> &BasicBlock<'a> {\n assert_ne!(block_id, self.current);\n self.blocks.block(block_id)\ndiff --git a\/compiler\/forget\/crates\/forget_hir\/src\/initialize.rs b\/compiler\/forget\/crates\/forget_hir\/src\/initialize.rs\nindex 1e58374f8e..7d626e680c 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/initialize.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/initialize.rs\n@@ -3,7 +3,10 @@ use std::collections::HashSet;\n use forget_diagnostics::{invariant, Diagnostic};\n use thiserror::Error;\n \n-use crate::{BlockId, Blocks, GotoKind, GotoTerminal, InstructionIdGenerator, TerminalValue, HIR};\n+use crate::{\n+ BlockId, BlockRewriter, BlockRewriterAction, Blocks, GotoKind, GotoTerminal,\n+ InstructionIdGenerator, TerminalValue, HIR,\n+};\n \n \/\/\/ Runs a variety of passes to put the HIR in canonical form. This should be called\n \/\/\/ after initial HIR construction and after any transformations that change the\n@@ -65,7 +68,7 @@ pub fn reverse_postorder_blocks<'a>(hir: &mut HIR<'a>) {\n \/\/ NOTE: could consider sorting the blocks in-place by key\n let mut blocks = Blocks::with_capacity(hir.blocks.len());\n for id in postorder.iter().rev().cloned() {\n- blocks.insert(hir.blocks.take(id));\n+ blocks.insert(hir.blocks.remove(id));\n }\n \n hir.blocks = blocks;\n@@ -73,52 +76,49 @@ pub fn reverse_postorder_blocks<'a>(hir: &mut HIR<'a>) {\n \n \/\/\/ Prunes ForTerminal.update values (sets to None) if they are unreachable\n pub fn remove_unreachable_for_updates<'a>(hir: &mut HIR<'a>) {\n- let block_ids = hir.blocks.block_ids();\n-\n- for block in hir.blocks.iter_mut() {\n+ BlockRewriter::new(&mut hir.blocks, hir.entry).each_block(|mut block, rewriter| {\n if let TerminalValue::For(terminal) = &mut block.terminal.value {\n if let Some(update) = terminal.update {\n- if !block_ids.contains(&update) {\n+ if !rewriter.contains(update) {\n terminal.update = None;\n }\n }\n }\n- }\n+ BlockRewriterAction::Keep(block)\n+ });\n }\n \n \/\/\/ Prunes unreachable fallthrough values, setting them to None if the referenced\n \/\/\/ block was not otherwise reachable.\n pub fn remove_unreachable_fallthroughs<'a>(hir: &mut HIR<'a>) {\n- let block_ids = hir.blocks.block_ids();\n-\n- for block in hir.blocks.iter_mut() {\n+ BlockRewriter::new(&mut hir.blocks, hir.entry).each_block(|mut block, rewriter| {\n block\n .terminal\n .value\n .map_optional_fallthroughs(|fallthrough| {\n- if block_ids.contains(&fallthrough) {\n+ if rewriter.contains(fallthrough) {\n Some(fallthrough)\n } else {\n None\n }\n- })\n- }\n+ });\n+ BlockRewriterAction::Keep(block)\n+ });\n }\n \n \/\/\/ Rewrites DoWhile statements into Gotos if the test block is not reachable\n pub fn remove_unreachable_do_while_statements<'a>(hir: &mut HIR<'a>) {\n- let block_ids = hir.blocks.block_ids();\n-\n- for block in hir.blocks.iter_mut() {\n+ BlockRewriter::new(&mut hir.blocks, hir.entry).each_block(|mut block, rewriter| {\n if let TerminalValue::DoWhile(terminal) = &mut block.terminal.value {\n- if !block_ids.contains(&terminal.test) {\n+ if !rewriter.contains(terminal.test) {\n block.terminal.value = TerminalValue::Goto(GotoTerminal {\n block: terminal.body,\n kind: GotoKind::Break,\n });\n }\n }\n- }\n+ BlockRewriterAction::Keep(block)\n+ });\n }\n \n \/\/\/ Updates the instruction ids for all instructions and blocks\ndiff --git a\/compiler\/forget\/crates\/forget_hir\/src\/merge_consecutive_blocks.rs b\/compiler\/forget\/crates\/forget_hir\/src\/merge_consecutive_blocks.rs\nindex 5f20687b80..a250595863 100644\n--- a\/compiler\/forget\/crates\/forget_hir\/src\/merge_consecutive_blocks.rs\n+++ b\/compiler\/forget\/crates\/forget_hir\/src\/merge_consecutive_blocks.rs\n@@ -27,7 +27,7 @@ pub fn merge_consecutive_blocks<'a>(\n let mut rewriter = BlockRewriter::new(blocks, fun.body.entry);\n let mut has_changes = false;\n \n- rewriter.each_block(|mut block, rewriter| {\n+ rewriter.try_each_block(|mut block, rewriter| {\n let block_id = block.id;\n \/\/ Visit instructions to merge blocks within function expressions\n for instr_ix in &block.instructions {\n","files":[{"status":"M","path":"compiler\/forget\/crates\/forget_hir\/src\/function.rs"},{"status":"M","path":"compiler\/forget\/crates\/forget_hir\/src\/initialize.rs"},{"status":"M","path":"compiler\/forget\/crates\/forget_hir\/src\/merge_consecutive_blocks.rs"}],"body":"","parents":["de0c2393add8ae48b107774fb87d8b4a04c630ed"]}

dillon1000/react

Files changed