feat(llvm): Phase 131-11-H/12 - ループキャリアPHI型修正 & vmap snapshot SSOT

## Phase 131-11-H: ループキャリアPHI型修正
- PHI生成時に初期値(entry block)の型のみ使用
- backedge の値を型推論に使わない(循環依存回避)
- NYASH_CARRIER_PHI_DEBUG=1 でトレース

## Phase 131-12-P0: def_blocks 登録 & STRICT エラー化
- safe_vmap_write() で PHI 上書き保護
- resolver miss を STRICT でエラー化(フォールバック 0 禁止)
- def_blocks 自動登録

## Phase 131-12-P1: vmap_cur スナップショット実装
- DeferredTerminator 構造体(block, term_ops, vmap_snapshot)
- Pass A で vmap_cur をスナップショット
- Pass C でスナップショット復元(try-finally)
- STRICT モード assert

## 結果
-  MIR PHI型: Integer(正しい)
-  VM: Result: 3
-  vmap snapshot 機構: 動作確認
- ⚠️ LLVM: Result: 0(別のバグ、次Phase で調査)

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

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
nyash-codex
2025-12-14 21:28:41 +09:00
parent 413504d6de
commit 7dfd6ff1d9
21 changed files with 1391 additions and 133 deletions

View File

@ -93,6 +93,19 @@ impl LoopHeaderPhiBuilder {
#[cfg(debug_assertions)]
crate::mir::join_ir::verify_phi_reserved::observe_phi_dst(loop_var_phi_dst);
// Phase 131-11-H: Set PHI type from entry incoming (init value) only
// Ignore backedge to avoid circular dependency in type inference
if let Some(init_type) = builder.value_types.get(&loop_var_init).cloned() {
builder.value_types.insert(loop_var_phi_dst, init_type.clone());
if debug || std::env::var("NYASH_CARRIER_PHI_DEBUG").ok().as_deref() == Some("1") {
eprintln!(
"[carrier/phi] Loop var '{}': dst=%{} entry_type={:?} (backedge ignored)",
loop_var_name, loop_var_phi_dst.as_u32(), init_type
);
}
}
info.carrier_phis.insert(
loop_var_name.to_string(),
CarrierPhiEntry {
@ -129,6 +142,19 @@ impl LoopHeaderPhiBuilder {
#[cfg(debug_assertions)]
crate::mir::join_ir::verify_phi_reserved::observe_phi_dst(phi_dst);
// Phase 131-11-H: Set PHI type from entry incoming (init value) only
// Ignore backedge to avoid circular dependency in type inference
if let Some(init_type) = builder.value_types.get(&init_value).cloned() {
builder.value_types.insert(phi_dst, init_type.clone());
if debug || std::env::var("NYASH_CARRIER_PHI_DEBUG").ok().as_deref() == Some("1") {
eprintln!(
"[carrier/phi] Carrier '{}': dst=%{} entry_type={:?} (backedge ignored)",
name, phi_dst.as_u32(), init_type
);
}
}
info.carrier_phis.insert(
name.clone(),
CarrierPhiEntry {