## 🎯 完了タスク ✅ Task 1: LoopForm v2 最小ユニットテスト全緑化(4/4パス) ✅ Task 2: program_v0 PHI trace スクリプト全緑化(5/5パス) ✅ Task 3: Stage-B 風ループ Rust テスト全緑化(2/2パス) 🔧 Task 4: Stage-1 using resolver (1/3パス、UsingStatement対応完了) ## 📝 主要修正 ### 1. ValueId(0)を無効値として予約 - **src/mir/function.rs**: MirFunction::new() で next_value_id を1から開始 - **src/mir/builder/stmts.rs**: build_local_statement で next_value_id() 使用 - **理由**: LoopForm v2 が ValueId(0) を無効値の sentinel として使用 - **効果**: SSA 構築時の ValueId 衝突を完全に防止 ### 2. Unreachable block 許容をデフォルト化 - **src/mir/verification/cfg.rs**: 到達可能性チェック削除 - **src/config/env.rs**: NYASH_VERIFY_ALLOW_UNREACHABLE 環境変数削除 - **src/tests/mir_loopform_exit_phi.rs**: 環境変数設定削除 - **理由**: break/continue/return の後の unreachable block は正当 - switch_to_unreachable_block_with_void() で意図的に作成 - LLVM IR の `unreachable` 命令と同じ標準的手法 - 削除は DCE (Dead Code Elimination) パスの仕事 - **効果**: 環境変数を減らしてシンプル化 ### 3. UsingStatement の MIR Builder 対応 - **src/mir/builder/exprs.rs**: UsingStatement → void 変換を追加 - **理由**: namespace 解決は parser/runner レベルで完了済み - **効果**: using 文を含むコードが MIR コンパイル可能に ### 4. スモークテストスクリプト修正 - **tools/smokes/v2/profiles/quick/core/phase2034/*.sh**: 5ファイル - **修正内容**: 二重コマンド置換のシンタックスエラー修正 - 誤: `out="$(out="$(COMMAND)"; rc=$?` - 正: `out="$(COMMAND)"; rc=$?` ## 🧪 テスト結果 - mir_loopform_exit_phi: 4/4パス ✅ - program_v0_*_phi_trace_vm: 5/5パス ✅ - mir_stageb_loop_break_continue: 2/2パス ✅ - mir_stage1_using_resolver: 1/3パス (残り2つは dominator violation) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com>
65 lines
2.9 KiB
Rust
65 lines
2.9 KiB
Rust
use crate::mir::function::MirFunction;
|
|
use crate::mir::{BasicBlockId, ValueId};
|
|
use crate::mir::verification_types::VerificationError;
|
|
use crate::mir::verification::utils;
|
|
use std::collections::{HashMap, HashSet};
|
|
|
|
/// Verify CFG references and reachability
|
|
pub fn check_control_flow(function: &MirFunction) -> Result<(), Vec<VerificationError>> {
|
|
let mut errors = Vec::new();
|
|
for (block_id, block) in &function.blocks {
|
|
for successor in &block.successors {
|
|
if !function.blocks.contains_key(successor) {
|
|
errors.push(VerificationError::ControlFlowError {
|
|
block: *block_id,
|
|
reason: format!("References non-existent block {}", successor),
|
|
});
|
|
}
|
|
}
|
|
}
|
|
// Unreachable blocks are allowed in MIR.
|
|
// They are created intentionally by break/continue/return statements via
|
|
// switch_to_unreachable_block_with_void() to continue SSA construction after
|
|
// control flow terminators. This is standard practice (see LLVM's `unreachable`).
|
|
// Dead code elimination pass (TODO) will remove them during optimization.
|
|
|
|
if errors.is_empty() { Ok(()) } else { Err(errors) }
|
|
}
|
|
|
|
/// Verify that merge blocks do not use predecessor-defined values directly (must go through Phi)
|
|
pub fn check_merge_uses(function: &MirFunction) -> Result<(), Vec<VerificationError>> {
|
|
if crate::config::env::verify_allow_no_phi() { return Ok(()); }
|
|
let mut errors = Vec::new();
|
|
let preds = utils::compute_predecessors(function);
|
|
let def_block = utils::compute_def_blocks(function);
|
|
let dominators = utils::compute_dominators(function);
|
|
let mut phi_dsts_in_block: HashMap<BasicBlockId, HashSet<ValueId>> = HashMap::new();
|
|
for (bid, block) in &function.blocks {
|
|
let set = phi_dsts_in_block.entry(*bid).or_default();
|
|
for inst in block.all_instructions() {
|
|
if let crate::mir::MirInstruction::Phi { dst, .. } = inst { set.insert(*dst); }
|
|
}
|
|
}
|
|
for (bid, block) in &function.blocks {
|
|
let Some(pred_list) = preds.get(bid) else { continue };
|
|
if pred_list.len() < 2 { continue; }
|
|
let phi_dsts = phi_dsts_in_block.get(bid);
|
|
let doms_of_block = dominators.get(bid).unwrap();
|
|
for inst in block.all_instructions() {
|
|
if let crate::mir::MirInstruction::Phi { .. } = inst { continue; }
|
|
for used in inst.used_values() {
|
|
if let Some(&db) = def_block.get(&used) {
|
|
if !doms_of_block.contains(&db) {
|
|
let is_phi_dst = phi_dsts.map(|s| s.contains(&used)).unwrap_or(false);
|
|
if !is_phi_dst {
|
|
errors.push(VerificationError::MergeUsesPredecessorValue { value: used, merge_block: *bid, pred_block: db });
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
if errors.is_empty() { Ok(()) } else { Err(errors) }
|
|
}
|
|
|