tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(joinir): Pattern 4 PHI loss fix with exit_bindings and block reuse

Browse Source 
Two root causes for Pattern 4 outputting 0 instead of 25:

1. instruction_rewriter.rs:92 - BasicBlock::new() was overwriting
   existing blocks that already contained PHI instructions from
   JoinIR Select lowering. Fixed by removing and reusing existing
   blocks instead of creating new ones.

2. pattern4_with_continue.rs - JoinIR exit PHI (ValueId 15) was not
   connected to host's sum variable, causing DCE to eliminate the PHI
   as "unused". Fixed by using new_with_exit_bindings() with explicit
   LoopExitBinding to connect k_exit's sum_exit to host's sum slot.

Test result: loop_continue_pattern4.hako now correctly outputs 25.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
nyash-codex
2025-12-06 01:54:47 +09:00
parent ee04ba4406
commit 318dceebfe
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/mir/builder/control_flow/joinir/patterns/pattern4_with_continue.rs
View File

@ -182,10 +182,18 @@ impl MirBuilder {
);
// Merge JoinIR blocks into current function
// Phase 195: Create and pass JoinInlineBoundary for Pattern 4
let boundary = crate::mir::join_ir::lowering::inline_boundary::JoinInlineBoundary::new_inputs_only(
// Phase 195 FIX: Use exit_bindings to connect k_exit's sum_exit to host's sum variable
// Pattern 4: k_exit(sum_exit) returns sum_exit, so we bind ValueId(15) to host's sum
let boundary = crate::mir::join_ir::lowering::inline_boundary::JoinInlineBoundary::new_with_exit_bindings(
vec![ValueId(0), ValueId(1)], // JoinIR's main() parameters (i_init, sum_init)
vec![loop_var_id, sum_var_id], // Host's loop variables
vec![
crate::mir::join_ir::lowering::inline_boundary::LoopExitBinding {
carrier_name: "sum".to_string(),
join_exit_value: ValueId(15), // k_exit's parameter (sum_exit)
host_slot: sum_var_id, // variable_map["sum"]
}
],
);
// Phase 195: Capture exit PHI result (Pattern 4 returns sum)
let result_val = self.merge_joinir_mir_blocks(&mir_module, Some(&boundary), debug)?;