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

fix(joinir): Phase 283 P0 - Pattern3 Undefined ValueId Bug Fix

Browse Source 
- Fix: extract_if_condition() moved after local_cond_env construction
  (loop_with_if_phi_if_sum.rs:175)
  - Root cause: condition extraction before i_param/sum_param creation
  - Result: i % 2 referenced caller's ConditionEnv with unmapped ValueId
- Fail-Fast: Add condition_bindings validation in merge (mod.rs)
- Fixture: Update loop_if_phi.hako for C2 compatibility (sum.toString())
- Verified: VM execution outputs sum=9 ✅

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
This commit is contained in:
tomoaki
2025-12-23 08:14:27 +09:00
parent 32ccccd272
commit bfbc9b26bf
6 changed files with 114 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
src/mir/builder/control_flow/joinir/merge/mod.rs
View File

@ -239,7 +239,24 @@ pub(in crate::mir::builder) fn merge_joinir_mir_blocks(
.flat_map(|params| params.iter().copied())
.collect();
// Phase 283 P0 DEBUG: Log condition_bindings count
trace.stderr_if(
&format!(
"[cf_loop/joinir] Phase 283 P0 DEBUG: Processing {} condition_bindings",
boundary.condition_bindings.len()
),
debug,
);
for binding in &boundary.condition_bindings {
trace.stderr_if(
&format!(
"[cf_loop/joinir] Phase 283 P0 DEBUG: Checking binding '{}' join={:?}",
binding.name, binding.join_value
),
debug,
);
if all_params.contains(&binding.join_value) {
trace.stderr_if(
&format!(
@ -249,14 +266,27 @@ pub(in crate::mir::builder) fn merge_joinir_mir_blocks(
debug,
);
} else {
trace.stderr_if(
&format!(
"[cf_loop/joinir] Phase 171-fix: Adding condition binding '{}' JoinIR {:?} to used_values",
// Phase 283 P0 FIX: Ensure remapper has valid mapping (Fail-Fast)
if let Some(host_id) = builder.variable_ctx.variable_map.get(&binding.name) {
// Variable exists in host context - map join_value to existing host_id
trace.stderr_if(
&format!(
"[cf_loop/joinir] Phase 283 P0: ✅ Condition binding '{}' JoinIR {:?} → host {:?}",
binding.name, binding.join_value, host_id
),
debug,
);
remapper.set_value(binding.join_value, *host_id);
used_values.insert(binding.join_value);
} else {
// Fail-Fast: No host ValueId found → surface root cause immediately
return Err(format!(
"[merge/phase2.1] Condition variable '{}' (join={:?}) has no host ValueId in variable_map. \
This indicates the value was not properly supplied by boundary builder or cond_env. \
Check: (1) boundary builder supplies all condition vars, (2) cond_env correctly tracks host ValueIds.",
binding.name, binding.join_value
),
debug,
);
used_values.insert(binding.join_value);
));
}
}
}