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>
This commit is contained in:
@ -6,54 +6,44 @@
|
||||
use crate::mir::{ConstValue, MirInstruction, ValueId};
|
||||
use crate::mir::builder::MirBuilder;
|
||||
|
||||
/// Helper to allocate value ID from correct generator (function-local or global)
|
||||
#[inline]
|
||||
fn next_value_id(b: &mut MirBuilder) -> ValueId {
|
||||
if let Some(ref mut f) = b.current_function {
|
||||
f.next_value_id()
|
||||
} else {
|
||||
b.value_gen.next()
|
||||
}
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_integer(b: &mut MirBuilder, val: i64) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::Integer(val) });
|
||||
dst
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_bool(b: &mut MirBuilder, val: bool) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::Bool(val) });
|
||||
dst
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_float(b: &mut MirBuilder, val: f64) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::Float(val) });
|
||||
dst
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_string<S: Into<String>>(b: &mut MirBuilder, s: S) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::String(s.into()) });
|
||||
dst
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_null(b: &mut MirBuilder) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::Null });
|
||||
dst
|
||||
}
|
||||
|
||||
#[inline]
|
||||
pub fn emit_void(b: &mut MirBuilder) -> ValueId {
|
||||
let dst = next_value_id(b);
|
||||
let dst = b.next_value_id();
|
||||
let _ = b.emit_instruction(MirInstruction::Const { dst, value: ConstValue::Void });
|
||||
dst
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user