Files
hakorune/src/mir/builder/schedule/block.rs
nyash-codex eadde8d1dd fix(mir/builder): use function-local ValueId throughout MIR builder
Phase 25.1b: Complete SSA fix - eliminate all global ValueId usage in function contexts.

Root cause: ~75 locations throughout MIR builder were using global value
generator (self.value_gen.next()) instead of function-local allocator
(f.next_value_id()), causing SSA verification failures and runtime
"use of undefined value" errors.

Solution:
- Added next_value_id() helper that automatically chooses correct allocator
- Fixed 19 files with ~75 occurrences of ValueId allocation
- All function-context allocations now use function-local IDs

Files modified:
- src/mir/builder/utils.rs: Added next_value_id() helper, fixed 8 locations
- src/mir/builder/builder_calls.rs: 17 fixes
- src/mir/builder/ops.rs: 8 fixes
- src/mir/builder/stmts.rs: 7 fixes
- src/mir/builder/emission/constant.rs: 6 fixes
- src/mir/builder/rewrite/*.rs: 10 fixes
- + 13 other files

Verification:
- cargo build --release: SUCCESS
- Simple tests with NYASH_VM_VERIFY_MIR=1: Zero undefined errors
- Multi-parameter static methods: All working

Known remaining: ValueId(22) in Stage-B (separate issue to investigate)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-17 00:48:18 +09:00

88 lines
3.8 KiB
Rust

use crate::mir::builder::MirBuilder;
use crate::mir::{MirInstruction, ValueId};
/// BlockScheduleBox — manage physical insertion points within a block.
/// Contract: PHI group → materialize group (Copy/Id) → body (Call etc.)
pub struct BlockScheduleBox;
impl BlockScheduleBox {
/// Insert a Copy immediately after PHI nodes. Returns the local value id.
pub fn ensure_after_phis_copy(builder: &mut MirBuilder, src: ValueId) -> Result<ValueId, String> {
if let Some(bb) = builder.current_block {
if let Some(&cached) = builder.schedule_mat_map.get(&(bb, src)) {
return Ok(cached);
}
let dst = builder.next_value_id();
builder.insert_copy_after_phis(dst, src)?;
builder.schedule_mat_map.insert((bb, src), dst);
return Ok(dst);
}
Err("No current block".into())
}
/// Emit a Copy right before the next emitted instruction (best-effort):
/// place it at the tail of the current block. Returns the local value id.
pub fn emit_before_call_copy(builder: &mut MirBuilder, src: ValueId) -> Result<ValueId, String> {
// Prefer to reuse the after-phis materialized id for this src in this block
let base = Self::ensure_after_phis_copy(builder, src)?;
let dst = builder.next_value_id();
builder.emit_instruction(MirInstruction::Copy { dst, src: base })?;
// Propagate metadata to keep dst consistent with base
crate::mir::builder::metadata::propagate::propagate(builder, base, dst);
Ok(dst)
}
/// Dev-only: verify simple block order invariants.
/// - PHI group must be at the block head (no PHI after first non-PHI)
/// - If a Copy immediately precedes a Call-like instruction, prefer that Copy's src
/// to be the previously materialized after-PHIs id (best-effort warning only).
pub fn verify_order(builder: &mut MirBuilder) {
if std::env::var("NYASH_BLOCK_SCHEDULE_VERIFY").ok().as_deref() != Some("1") {
return;
}
let (f_opt, bb_opt) = (builder.current_function.as_ref(), builder.current_block);
let (Some(fun), Some(bb_id)) = (f_opt, bb_opt) else { return; };
let Some(bb) = fun.get_block(bb_id) else { return; };
// 1) PHI group must be at head
let mut seen_non_phi = false;
for (idx, inst) in bb.instructions.iter().enumerate() {
match inst {
MirInstruction::Phi { .. } => {
if seen_non_phi {
eprintln!("[block-schedule][verify] WARN: PHI found after non-PHI at bb={:?} idx={}", bb_id, idx);
}
}
_ => { seen_non_phi = true; }
}
}
// 2) If a Copy is immediately before a Call-like, prefer it to be derived from after-PHIs copy
let is_call_like = |mi: &MirInstruction| -> bool {
matches!(mi,
MirInstruction::Call { .. } |
MirInstruction::BoxCall { .. } |
MirInstruction::PluginInvoke { .. } |
MirInstruction::ExternCall { .. }
)
};
for w in bb.instructions.windows(2) {
if let [MirInstruction::Copy { dst: _, src }, call] = w {
if is_call_like(call) {
// best-effort: src should be one of the after-PHIs materialized ids for this bb
let derived_ok = builder
.schedule_mat_map
.values()
.any(|&v| v == *src);
if !derived_ok {
eprintln!(
"[block-schedule][verify] WARN: tail Copy src=%{} is not from after-PHIs in bb={:?}",
src.0, bb_id
);
}
}
}
}
}
}