From 77798f3da46aefe3a4bc6c47a7f6ca81f424f848 Mon Sep 17 00:00:00 2001 From: Nguyen Anh Quynh Date: Fri, 13 Oct 2023 18:10:13 +0800 Subject: [PATCH] rename StacklessControlFlowGraph::is_dummmy() to is_dummy() --- third_party/move/evm/move-to-yul/src/functions.rs | 4 ++-- third_party/move/move-model/bytecode/src/dataflow_analysis.rs | 4 ++-- .../move-model/bytecode/src/stackless_control_flow_graph.rs | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/third_party/move/evm/move-to-yul/src/functions.rs b/third_party/move/evm/move-to-yul/src/functions.rs index e1461cfc50f12..afa7d84564f32 100644 --- a/third_party/move/evm/move-to-yul/src/functions.rs +++ b/third_party/move/evm/move-to-yul/src/functions.rs @@ -114,7 +114,7 @@ impl<'a> FunctionGenerator<'a> { // Emit state machine to represent control flow. // TODO: Eliminate the need for this, see also // https://medium.com/leaningtech/solving-the-structured-control-flow-problem-once-and-for-all-5123117b1ee2 - if cfg.successors(entry_bb).iter().all(|b| cfg.is_dummmy(*b)) { + if cfg.successors(entry_bb).iter().all(|b| cfg.is_dummy(*b)) { // In this trivial case, we have only one block and can omit the state machine if let BlockContent::Basic { lower, upper } = cfg.content(entry_bb) { for offs in *lower..*upper + 1 { @@ -174,7 +174,7 @@ impl<'a> FunctionGenerator<'a> { /// Get the actual entry block, skipping trailing dummy blocks. fn get_actual_entry_block(cfg: &StacklessControlFlowGraph) -> BlockId { let mut entry_bb = cfg.entry_block(); - while cfg.is_dummmy(entry_bb) { + while cfg.is_dummy(entry_bb) { assert_eq!(cfg.successors(entry_bb).len(), 1); entry_bb = *cfg.successors(entry_bb).iter().last().unwrap(); } diff --git a/third_party/move/move-model/bytecode/src/dataflow_analysis.rs b/third_party/move/move-model/bytecode/src/dataflow_analysis.rs index 174abda948bc7..0c4ca01685de6 100644 --- a/third_party/move/move-model/bytecode/src/dataflow_analysis.rs +++ b/third_party/move/move-model/bytecode/src/dataflow_analysis.rs @@ -36,7 +36,7 @@ pub trait TransferFunctions { instrs: &[Bytecode], cfg: &StacklessControlFlowGraph, ) -> Self::State { - if cfg.is_dummmy(block_id) { + if cfg.is_dummy(block_id) { return state; } let instr_inds = cfg.instr_indexes(block_id).unwrap(); @@ -126,7 +126,7 @@ pub trait DataflowAnalysis: TransferFunctions { let mut result = BTreeMap::new(); for (block_id, block_state) in state_map { let mut state = block_state.pre; - if !cfg.is_dummmy(block_id) { + if !cfg.is_dummy(block_id) { let instr_inds = cfg.instr_indexes(block_id).unwrap(); if Self::BACKWARD { for offset in instr_inds.rev() { diff --git a/third_party/move/move-model/bytecode/src/stackless_control_flow_graph.rs b/third_party/move/move-model/bytecode/src/stackless_control_flow_graph.rs index 7cdb25b31f5ec..b25c20081dff0 100644 --- a/third_party/move/move-model/bytecode/src/stackless_control_flow_graph.rs +++ b/third_party/move/move-model/bytecode/src/stackless_control_flow_graph.rs @@ -238,7 +238,7 @@ impl StacklessControlFlowGraph { self.blocks.len() as u16 } - pub fn is_dummmy(&self, block_id: BlockId) -> bool { + pub fn is_dummy(&self, block_id: BlockId) -> bool { matches!(self.blocks[&block_id].content, BlockContent::Dummy) }