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>
54 lines
1.9 KiB
Rust
54 lines
1.9 KiB
Rust
use std::path::Path;
|
|
|
|
/// Run a Nyash program as a child (`nyash --backend vm <program>`) and capture the first JSON v0 line.
|
|
/// - `exe`: path to nyash executable
|
|
/// - `program`: path to the Nyash script to run (e.g., apps/selfhost/compiler/compiler.hako)
|
|
/// - `timeout_ms`: kill child after this duration
|
|
/// - `extra_args`: additional args to pass after program (e.g., "--", "--read-tmp")
|
|
/// - `env_remove`: environment variable names to remove for the child
|
|
/// - `envs`: key/value pairs to set for the child
|
|
pub fn run_ny_program_capture_json(
|
|
exe: &Path,
|
|
program: &Path,
|
|
timeout_ms: u64,
|
|
extra_args: &[&str],
|
|
env_remove: &[&str],
|
|
envs: &[(&str, &str)],
|
|
) -> Option<String> {
|
|
use std::process::Command;
|
|
let mut cmd = Command::new(exe);
|
|
// Phase 25.1b: Use selfhost compiler env (enables using/file resolution for compiler.hako)
|
|
crate::runner::child_env::apply_selfhost_compiler_env(&mut cmd);
|
|
cmd.arg("--backend").arg("vm").arg(program);
|
|
for a in extra_args {
|
|
cmd.arg(a);
|
|
}
|
|
for k in env_remove {
|
|
cmd.env_remove(k);
|
|
}
|
|
for (k, v) in envs {
|
|
cmd.env(k, v);
|
|
}
|
|
let out = match crate::runner::modes::common_util::io::spawn_with_timeout(cmd, timeout_ms) {
|
|
Ok(o) => o,
|
|
Err(e) => {
|
|
eprintln!("[selfhost-child] spawn failed: {}", e);
|
|
return None;
|
|
}
|
|
};
|
|
if out.timed_out {
|
|
let head = String::from_utf8_lossy(&out.stdout).chars().take(200).collect::<String>();
|
|
eprintln!(
|
|
"[selfhost-child] timeout after {} ms; stdout(head)='{}'",
|
|
timeout_ms,
|
|
head.replace('\n', "\\n")
|
|
);
|
|
return None;
|
|
}
|
|
let stdout = match String::from_utf8(out.stdout) {
|
|
Ok(s) => s,
|
|
Err(_) => String::new(),
|
|
};
|
|
crate::runner::modes::common_util::selfhost::json::first_json_v0_line(stdout)
|
|
}
|