eadde8d1dd
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>
42 lines
1.5 KiB
Rust
42 lines
1.5 KiB
Rust
use super::ValueId;
|
|
use crate::ast::ASTNode;
|
|
|
|
impl super::MirBuilder {
|
|
// QMarkPropagate: result?.value (Result-like)
|
|
pub(super) fn build_qmark_propagate_expression(
|
|
&mut self,
|
|
expression: ASTNode,
|
|
) -> Result<ValueId, String> {
|
|
let res_val = self.build_expression_impl(expression)?;
|
|
let res_local = self.local_ssa_ensure(res_val, 0);
|
|
let ok_id = self.next_value_id();
|
|
self.emit_instruction(super::MirInstruction::BoxCall {
|
|
dst: Some(ok_id),
|
|
box_val: res_local,
|
|
method: "isOk".to_string(),
|
|
args: vec![],
|
|
method_id: None,
|
|
effects: super::EffectMask::PURE,
|
|
})?;
|
|
let then_block = self.block_gen.next();
|
|
let else_block = self.block_gen.next();
|
|
let ok_local = self.local_ssa_ensure(ok_id, 4);
|
|
crate::mir::builder::emission::branch::emit_conditional(self, ok_local, then_block, else_block)?;
|
|
self.start_new_block(then_block)?;
|
|
self.emit_instruction(super::MirInstruction::Return {
|
|
value: Some(res_local),
|
|
})?;
|
|
self.start_new_block(else_block)?;
|
|
let val_id = self.next_value_id();
|
|
self.emit_instruction(super::MirInstruction::BoxCall {
|
|
dst: Some(val_id),
|
|
box_val: res_local,
|
|
method: "getValue".to_string(),
|
|
args: vec![],
|
|
method_id: None,
|
|
effects: super::EffectMask::PURE,
|
|
})?;
|
|
Ok(val_id)
|
|
}
|
|
}
|