From 1e3a26885f3ec1b4ffb58f9a6e142a99d1da7eba Mon Sep 17 00:00:00 2001 From: Afloat Date: Wed, 11 Nov 2026 01:16:26 +0800 Subject: [PATCH] Port EVM inspection: Avoid repeated selector scans in EVM dispatchers (R3.12) (#1538) Source: storytold/craft-anything@1565bd4278955161e4c704cee37bbae9f22bfb3a:crates/formats/src/evm.rs --- crates/evm/src/lib.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/crates/evm/src/lib.rs b/crates/evm/src/lib.rs index 94cbf74f1..059252dc4 100644 --- a/crates/evm/src/lib.rs +++ b/crates/evm/src/lib.rs @@ -6,6 +6,7 @@ use crate::FormatError; use serde::Serialize; use serde_json::{Map, Value}; +use std::collections::BTreeSet; /// Largest bytecode we analyse (16 MiB; deployed contracts are at most 24 KiB). pub const MAX_CODE: usize = 16 << 20; @@ -455,6 +456,7 @@ pub fn analyze(code: &[u8]) -> Result { .any(|(k, i)| i.op == 0x34 && rejects_value(body, &ins, k, &index_of)); let mut functions: Vec = Vec::new(); + let mut selectors = BTreeSet::new(); let mut splits = 0usize; let mut last_jumpi: Option = None; let mut solc_like = 0usize; @@ -510,10 +512,10 @@ pub fn analyze(code: &[u8]) -> Result { if n < 4 && extraction.is_none() { continue; } - let selector = format!("0x{sel:08x}"); - if functions.iter().any(|f| f.selector == selector) { + if !selectors.insert(sel) { continue; } + let selector = format!("0x{sel:08x}"); if pattern == "eq-jumpi" { solc_like += 1; } else {