Skip to content

feat(decompile): retain canonical SSA sidecar #752

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Jon-Becker wants to merge 1 commit into from
+13 −1
Open

feat(decompile): retain canonical SSA sidecar #752

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 13 additions & 1 deletion crates/decompile/src/core/canonical.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ use heimdall_vm::core::{
context::{analyze_contextual, ContextualCfg, ContextualPoint},
hardfork::HardFork,
program::{BlockId, Program},
ssa::{build_contextual_ssa, ContextualSsa},
};

/// Existing selector discovery mapped onto canonical basic blocks.
Expand All @@ -28,6 +29,8 @@ pub struct CanonicalAnalysis {
pub program: Program,
/// Context-sensitive abstract CFG, including all uncertainty diagnostics.
pub cfg: ContextualCfg,
/// Contextual stack SSA and effect operands derived from `cfg`.
pub ssa: ContextualSsa,
/// Legacy-discovered selectors annotated with canonical entry blocks.
pub function_entries: BTreeMap<String, CanonicalFunctionEntry>,
}
Expand All @@ -47,6 +50,7 @@ pub(crate) fn build_canonical_analysis(
) -> CanonicalAnalysis {
let program = Program::decode(bytecode, hardfork);
let cfg = analyze_contextual(&program);
let ssa = build_contextual_ssa(&cfg);
let function_entries = selectors
.iter()
.map(|(selector, &entry_pc)| {
Expand All @@ -57,7 +61,7 @@ pub(crate) fn build_canonical_analysis(
(selector.clone(), CanonicalFunctionEntry { entry_pc, block })
})
.collect();
CanonicalAnalysis { program, cfg, function_entries }
CanonicalAnalysis { program, cfg, ssa, function_entries }
}

#[cfg(test)]
Expand Down Expand Up @@ -97,5 +101,13 @@ mod tests {
assert!(!analysis.cfg.expressions.is_empty());
assert!(analysis.cfg.state_versions.version_count() > 3);
assert_eq!(analysis.cfg.exit_states.len(), analysis.cfg.entry_states.len());
assert_eq!(analysis.ssa.blocks.len(), analysis.cfg.entry_states.len());
assert!(analysis
.ssa
.blocks
.values()
.flat_map(|block| &block.effects)
.any(|effect| effect.kind ==
heimdall_vm::core::analysis::InstructionEffectKind::StorageWrite));
}
}
Loading