Skip to content

feat: Wave 3 — SC→REQ traceability, float helpers, orphan fixes #79

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
avrabe wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: Wave 3 — SC→REQ traceability, float helpers, orphan fixes #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05c328e
feat: Wave 3 — SC→REQ traceability links, float helpers, orphan fixes
avrabe Apr 13, 2026
f15f593
chore: fix clippy::collapsible_match (rustc 1.95)
avrabe Apr 20, 2026
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
26 changes: 12 additions & 14 deletions loom-core/src/fused_optimizer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -571,26 +571,24 @@ fn adapter_uses_single_memory(instructions: &[Instruction], expected_mem: u32) -
| Instruction::I32Store16 { mem, .. }
| Instruction::I64Store8 { mem, .. }
| Instruction::I64Store16 { mem, .. }
| Instruction::I64Store32 { mem, .. } => {
if *mem != expected_mem {
return false;
}
| Instruction::I64Store32 { mem, .. }
if *mem != expected_mem =>
{
return false;
}
Instruction::Block { body, .. } | Instruction::Loop { body, .. } => {
if !adapter_uses_single_memory(body, expected_mem) {
return false;
}
Instruction::Block { body, .. } | Instruction::Loop { body, .. }
if !adapter_uses_single_memory(body, expected_mem) =>
{
return false;
}
Instruction::If {
then_body,
else_body,
..
} => {
if !adapter_uses_single_memory(then_body, expected_mem)
|| !adapter_uses_single_memory(else_body, expected_mem)
{
return false;
}
} if (!adapter_uses_single_memory(then_body, expected_mem)
|| !adapter_uses_single_memory(else_body, expected_mem)) =>
{
return false;
}
_ => {}
}
Expand Down
101 changes: 42 additions & 59 deletions loom-core/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6614,21 +6614,19 @@ pub mod optimize {
for instr in instructions {
match instr {
// Recursively check nested blocks
Instruction::Block { body, .. } | Instruction::Loop { body, .. } => {
if has_unsupported_isle_instructions_in_block(body) {
return true;
}
Instruction::Block { body, .. } | Instruction::Loop { body, .. }
if has_unsupported_isle_instructions_in_block(body) =>
{
return true;
}
Instruction::If {
then_body,
else_body,
..
} => {
if has_unsupported_isle_instructions_in_block(then_body)
|| has_unsupported_isle_instructions_in_block(else_body)
{
return true;
}
} if (has_unsupported_isle_instructions_in_block(then_body)
|| has_unsupported_isle_instructions_in_block(else_body)) =>
{
return true;
}

// Unknown instructions (opaque — cannot model stack effects)
Expand Down Expand Up @@ -6699,21 +6697,19 @@ pub mod optimize {
for instr in instructions {
match instr {
Instruction::BrIf { .. } | Instruction::BrTable { .. } => return true,
Instruction::Block { body, .. } | Instruction::Loop { body, .. } => {
if has_dataflow_unsafe_control_flow_in_block(body) {
return true;
}
Instruction::Block { body, .. } | Instruction::Loop { body, .. }
if has_dataflow_unsafe_control_flow_in_block(body) =>
{
return true;
}
Instruction::If {
then_body,
else_body,
..
} => {
if has_dataflow_unsafe_control_flow_in_block(then_body)
|| has_dataflow_unsafe_control_flow_in_block(else_body)
{
return true;
}
} if (has_dataflow_unsafe_control_flow_in_block(then_body)
|| has_dataflow_unsafe_control_flow_in_block(else_body)) =>
{
return true;
}
_ => {}
}
Expand Down Expand Up @@ -7355,20 +7351,18 @@ pub mod optimize {
}

// Recursively check nested structures
Instruction::Block { body, .. } | Instruction::Loop { body, .. } => {
if contains_branches(body) {
return true;
}
Instruction::Block { body, .. } | Instruction::Loop { body, .. }
if contains_branches(body) =>
{
return true;
}

Instruction::If {
then_body,
else_body,
..
} => {
if contains_branches(then_body) || contains_branches(else_body) {
return true;
}
} if (contains_branches(then_body) || contains_branches(else_body)) => {
return true;
}

_ => {}
Expand Down Expand Up @@ -7713,13 +7707,12 @@ pub mod optimize {
// Clear equivalence when a local is set (unless it's from the pattern above)
// This ensures we don't use stale equivalences after a local is modified
match instr {
Instruction::LocalSet(idx) => {
Instruction::LocalSet(idx)
// Check if this is NOT the target of a local.get; local.set pattern
if i == 0 || !matches!(&instructions[i - 1], Instruction::LocalGet(_)) {
if (i == 0 || !matches!(&instructions[i - 1], Instruction::LocalGet(_))) => {
// This set breaks any prior equivalence
equivalences.remove(idx);
}
}
Instruction::LocalTee(idx) => {
// Tee also breaks equivalence (unless immediately after local.get of same local)
equivalences.remove(idx);
Expand Down Expand Up @@ -8166,26 +8159,18 @@ pub mod optimize {
*position += 1;

match instr {
Instruction::LocalSet(_) => {
if redundant_positions.contains(&current_pos) {
// Replace redundant set with drop (preserves stack effects)
result.push(Instruction::Drop);
*changed = true;
} else {
result.push(instr.clone());
}
Instruction::LocalSet(_) if redundant_positions.contains(&current_pos) => {
// Replace redundant set with drop (preserves stack effects)
result.push(Instruction::Drop);
*changed = true;
}

Instruction::LocalTee(_) => {
if tee_positions_to_remove.contains(&current_pos) {
// Remove redundant tee entirely (value stays on stack)
// Don't push anything - this preserves stack because:
// tee: pop value, set local, push value -> net effect: value stays
// nothing: value stays
*changed = true;
} else {
result.push(instr.clone());
}
Instruction::LocalTee(_) if tee_positions_to_remove.contains(&current_pos) => {
// Remove redundant tee entirely (value stays on stack)
// Don't push anything - this preserves stack because:
// tee: pop value, set local, push value -> net effect: value stays
// nothing: value stays
*changed = true;
}

Instruction::Block { block_type, body } => {
Expand Down Expand Up @@ -9796,19 +9781,18 @@ pub mod optimize {
use crate::Instruction;
for instr in instructions {
match instr {
Instruction::LocalGet(idx) => {
Instruction::LocalGet(idx)
// Parameters are always live (don't coalesce them)
if *idx >= param_count as u32 {
if *idx >= param_count as u32 => {
let info = local_info.entry(*idx).or_default();
info.last_use = Some(*position);
if info.first_def.is_none() {
// If we see a get before any set, treat it as defined at position 0
info.first_def = Some(0);
}
}
}
Instruction::LocalSet(idx) | Instruction::LocalTee(idx) => {
if *idx >= param_count as u32 {
Instruction::LocalSet(idx) | Instruction::LocalTee(idx)
if *idx >= param_count as u32 => {
let info = local_info.entry(*idx).or_default();
if info.first_def.is_none() {
info.first_def = Some(*position);
Expand All @@ -9818,7 +9802,6 @@ pub mod optimize {
info.last_use = Some(*position);
}
}
}
// Recurse into control flow
Instruction::Block { body, .. } | Instruction::Loop { body, .. } => {
scan_instructions(body, local_info, position, param_count);
Expand Down Expand Up @@ -10315,10 +10298,10 @@ pub mod optimize {
| Instruction::Return => return false,

// Local modifications invalidate if they reference our locals
Instruction::LocalSet(idx) | Instruction::LocalTee(idx) => {
if first.referenced_locals.contains(idx) {
return false;
}
Instruction::LocalSet(idx) | Instruction::LocalTee(idx)
if first.referenced_locals.contains(idx) =>
{
return false;
}

// Memory operations are conservatively rejected for now
Expand Down
24 changes: 10 additions & 14 deletions loom-core/src/stack.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1209,29 +1209,25 @@ pub mod validation {
// Call and CallIndirect need type context - only unanalyzable if we don't have it
// CallIndirect's stack signature is fully determined by type_idx (statically known),
// even though the target function is resolved at runtime from the table.
Call(_) | CallIndirect { .. } => {
if !has_context {
return true;
}
Call(_) | CallIndirect { .. } if !has_context => {
return true;
}
// Unknown instructions have unknown stack effects - can't validate
Unknown(_) => return true,
// Recursively check nested bodies
Block { body, .. } | Loop { body, .. } => {
if contains_unanalyzable_instructions(body, has_context) {
return true;
}
Block { body, .. } | Loop { body, .. }
if contains_unanalyzable_instructions(body, has_context) =>
{
return true;
}
If {
then_body,
else_body,
..
} => {
if contains_unanalyzable_instructions(then_body, has_context)
|| contains_unanalyzable_instructions(else_body, has_context)
{
return true;
}
} if (contains_unanalyzable_instructions(then_body, has_context)
|| contains_unanalyzable_instructions(else_body, has_context)) =>
{
return true;
}
_ => {}
}
Expand Down
Loading
Loading