fix(mir): LoopForm v2完全緑化 - ValueId(0)予約 & unreachable block許容
## 🎯 完了タスク ✅ 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>
This commit is contained in:
nyash-codex
@ -5,6 +5,11 @@ use crate::ast::{ASTNode, AssignStmt, ReturnStmt, BinaryExpr, CallExpr, MethodCa
|
||||
impl super::MirBuilder {
|
||||
// Main expression dispatcher
|
||||
pub(super) fn build_expression_impl(&mut self, ast: ASTNode) -> Result<ValueId, String> {
|
||||
if std::env::var("NYASH_LOOPFORM_DEBUG").is_ok() {
|
||||
if matches!(ast, ASTNode::Loop { .. }) {
|
||||
eprintln!("[build_expression_impl] === ENTRY === processing Loop node");
|
||||
}
|
||||
}
|
||||
match ast {
|
||||
// Control flow constructs (formerly in exprs_legacy)
|
||||
ASTNode::Program { statements, .. } => {
|
||||
@ -32,6 +37,9 @@ impl super::MirBuilder {
|
||||
self.cf_if(*condition, then_node, else_node)
|
||||
}
|
||||
ASTNode::Loop { condition, body, .. } => {
|
||||
if std::env::var("NYASH_LOOPFORM_DEBUG").is_ok() {
|
||||
eprintln!("[exprs.rs:35] FIRST Loop pattern matched");
|
||||
}
|
||||
self.cf_loop(*condition, body)
|
||||
}
|
||||
ASTNode::While { condition, body, .. } => {
|
||||
@ -160,33 +168,42 @@ impl super::MirBuilder {
|
||||
// Special entry box: materialize main() as Program and lower others as static functions
|
||||
self.build_static_main_box(name.clone(), methods.clone())
|
||||
} else if is_static {
|
||||
// Generic static box: lower all static methods into standalone MIR functions (BoxName.method/N)
|
||||
// Note: Metadata clearing is now handled by BoxCompilationContext (箱理論)
|
||||
// See lifecycle.rs for context creation and builder_calls.rs for context swap
|
||||
self.user_defined_boxes.insert(name.clone());
|
||||
for (method_name, method_ast) in methods.clone() {
|
||||
if let ASTNode::FunctionDeclaration { params, body, .. } = method_ast {
|
||||
let func_name = format!(
|
||||
"{}.{}{}",
|
||||
name,
|
||||
method_name,
|
||||
format!("/{}", params.len())
|
||||
);
|
||||
self.lower_static_method_as_function(
|
||||
func_name,
|
||||
params.clone(),
|
||||
body.clone(),
|
||||
)?;
|
||||
// Index static method for fallback resolution of bare calls
|
||||
self.static_method_index
|
||||
.entry(method_name.clone())
|
||||
.or_insert_with(Vec::new)
|
||||
.push((name.clone(), params.len()));
|
||||
// In App mode (Main/main present), static boxes are lowered in lower_root().
|
||||
// Here we only handle Script/Test mode or non-root contexts.
|
||||
let is_app_mode = self.root_is_app_mode.unwrap_or(false);
|
||||
if is_app_mode {
|
||||
// Already lowered by lifecycle pass; return Void as a pure declaration.
|
||||
let void_val = crate::mir::builder::emission::constant::emit_void(self);
|
||||
Ok(void_val)
|
||||
} else {
|
||||
// Generic static box: lower all static methods into standalone MIR functions (BoxName.method/N)
|
||||
// Note: Metadata clearing is now handled by BoxCompilationContext (箱理論)
|
||||
// See lifecycle.rs for context creation and builder_calls.rs for context swap
|
||||
self.user_defined_boxes.insert(name.clone());
|
||||
for (method_name, method_ast) in methods.clone() {
|
||||
if let ASTNode::FunctionDeclaration { params, body, .. } = method_ast {
|
||||
let func_name = format!(
|
||||
"{}.{}{}",
|
||||
name,
|
||||
method_name,
|
||||
format!("/{}", params.len())
|
||||
);
|
||||
self.lower_static_method_as_function(
|
||||
func_name,
|
||||
params.clone(),
|
||||
body.clone(),
|
||||
)?;
|
||||
// Index static method for fallback resolution of bare calls
|
||||
self.static_method_index
|
||||
.entry(method_name.clone())
|
||||
.or_insert_with(Vec::new)
|
||||
.push((name.clone(), params.len()));
|
||||
}
|
||||
}
|
||||
// Return void for declaration context
|
||||
let void_val = crate::mir::builder::emission::constant::emit_void(self);
|
||||
Ok(void_val)
|
||||
}
|
||||
// Return void for declaration context
|
||||
let void_val = crate::mir::builder::emission::constant::emit_void(self);
|
||||
Ok(void_val)
|
||||
} else {
|
||||
// Instance box: register type and lower instance methods/ctors as functions
|
||||
self.user_defined_boxes.insert(name.clone());
|
||||
@ -327,54 +344,12 @@ impl super::MirBuilder {
|
||||
self.build_await_expression(*expression.clone())
|
||||
}
|
||||
|
||||
|
||||
|
||||
ASTNode::Program { statements, .. } => self.cf_block(statements.clone()),
|
||||
ASTNode::ScopeBox { body, .. } => self.cf_block(body.clone()),
|
||||
|
||||
ASTNode::Print { expression, .. } => self.build_print_statement(*expression.clone()),
|
||||
|
||||
ASTNode::If {
|
||||
condition,
|
||||
then_body,
|
||||
else_body,
|
||||
..
|
||||
} => {
|
||||
let else_ast = if let Some(else_statements) = else_body {
|
||||
Some(ASTNode::Program {
|
||||
statements: else_statements.clone(),
|
||||
span: crate::ast::Span::unknown(),
|
||||
})
|
||||
} else {
|
||||
None
|
||||
};
|
||||
self.cf_if(
|
||||
*condition.clone(),
|
||||
ASTNode::Program {
|
||||
statements: then_body.clone(),
|
||||
span: crate::ast::Span::unknown(),
|
||||
},
|
||||
else_ast,
|
||||
)
|
||||
// UsingStatement: namespace resolution is done at parser/runner level.
|
||||
// No MIR emission needed - just return void.
|
||||
ASTNode::UsingStatement { .. } => {
|
||||
Ok(crate::mir::builder::emission::constant::emit_void(self))
|
||||
}
|
||||
|
||||
ASTNode::Loop {
|
||||
condition, body, ..
|
||||
} => self.cf_loop(*condition.clone(), body.clone()),
|
||||
|
||||
ASTNode::TryCatch {
|
||||
try_body,
|
||||
catch_clauses,
|
||||
finally_body,
|
||||
..
|
||||
} => self.cf_try_catch(
|
||||
try_body.clone(),
|
||||
catch_clauses.clone(),
|
||||
finally_body.clone(),
|
||||
),
|
||||
|
||||
ASTNode::Throw { expression, .. } => self.cf_throw(*expression.clone()),
|
||||
|
||||
_ => Err(format!("Unsupported AST node type: {:?}", ast)),
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user