tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更

Browse Source 
Phase 25.1 完了成果:
- ✅ LoopForm v2 テスト・ドキュメント・コメント完備
  - 4ケース（A/B/C/D）完全テストカバレッジ
  - 最小再現ケース作成（SSAバグ調査用）
  - SSOT文書作成（loopform_ssot.md）
  - 全ソースに [LoopForm] コメントタグ追加

- ✅ Stage-1 CLI デバッグ環境構築
  - stage1_cli.hako 実装
  - stage1_bridge.rs ブリッジ実装
  - デバッグツール作成（stage1_debug.sh/stage1_minimal.sh）
  - アーキテクチャ改善提案文書

- ✅ 環境変数削減計画策定
  - 25変数の完全調査・分類
  - 6段階削減ロードマップ（25→5、80%削減）
  - 即時削除可能変数特定（NYASH_CONFIG/NYASH_DEBUG）

Phase 26-D からの累積変更:
- PHI実装改善（ExitPhiBuilder/HeaderPhiBuilder等）
- MIRビルダーリファクタリング
- 型伝播・最適化パス改善
- その他約300ファイルの累積変更

🎯 技術的成果:
- SSAバグ根本原因特定（条件分岐内loop変数変更）
- Region+next_iパターン適用完了（UsingCollectorBox等）
- LoopFormパターン文書化・テスト化完了
- セルフホスティング基盤強化

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: ChatGPT <noreply@openai.com>
Co-Authored-By: Task Assistant <task@anthropic.com>
This commit is contained in:
nyash-codex
2025-11-21 06:25:17 +09:00
parent baf028a94f
commit f9d100ce01
366 changed files with 14322 additions and 5236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

119
src/mir/builder/rewrite/known.rs
View File

@ -5,12 +5,20 @@ fn rewrite_enabled() -> bool {
// New primary flag (P4): NYASH_REWRITE_KNOWN_DEFAULT (default ON; allow explicit OFF)
if let Ok(v) = std::env::var("NYASH_REWRITE_KNOWN_DEFAULT") {
let s = v.to_ascii_lowercase();
if s == "0" || s == "false" || s == "off" { return false; }
if s == "1" || s == "true" || s == "on" { return true; }
if s == "0" || s == "false" || s == "off" {
return false;
}
if s == "1" || s == "true" || s == "on" {
return true;
}
// fallthrough to legacy if malformed
}
// Legacy flag (kept for compatibility): NYASH_BUILDER_REWRITE_INSTANCE (default ON)
match std::env::var("NYASH_BUILDER_REWRITE_INSTANCE").ok().as_deref().map(|v| v.to_ascii_lowercase()) {
match std::env::var("NYASH_BUILDER_REWRITE_INSTANCE")
.ok()
.as_deref()
.map(|v| v.to_ascii_lowercase())
{
Some(ref s) if s == "0" || s == "false" || s == "off" => false,
Some(ref s) if s == "1" || s == "true" || s == "on" => true,
_ => true, // default ON (spec unchanged; can opt out by setting ...=0)
@ -40,13 +48,23 @@ pub(crate) fn try_known_rewrite(
return None;
}
// Policy gates（従来互換）
let allow_userbox_rewrite = std::env::var("NYASH_DEV_REWRITE_USERBOX").ok().as_deref() == Some("1");
let allow_new_origin = std::env::var("NYASH_DEV_REWRITE_NEW_ORIGIN").ok().as_deref() == Some("1");
let allow_userbox_rewrite =
std::env::var("NYASH_DEV_REWRITE_USERBOX").ok().as_deref() == Some("1");
let allow_new_origin = std::env::var("NYASH_DEV_REWRITE_NEW_ORIGIN")
.ok()
.as_deref()
== Some("1");
let from_new_origin = builder.value_origin_newbox.get(&object_value).is_some();
let arity = arg_values.len();
let fname = crate::mir::builder::calls::function_lowering::generate_method_function_name(cls, method, arity);
let module_has = if let Some(ref module) = builder.current_module { module.functions.contains_key(&fname) } else { false };
if !( (module_has || allow_userbox_rewrite) || (from_new_origin && allow_new_origin) ) {
let fname = crate::mir::builder::calls::function_lowering::generate_method_function_name(
cls, method, arity,
);
let module_has = if let Some(ref module) = builder.current_module {
module.functions.contains_key(&fname)
} else {
false
};
if !((module_has || allow_userbox_rewrite) || (from_new_origin && allow_new_origin)) {
return None;
}
// Materialize function call: pass 'me' first, then args (unified call)
@ -59,7 +77,9 @@ pub(crate) fn try_known_rewrite(
Some(dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
// Annotate and emit choose
let chosen = fname.clone();
builder.annotate_call_result_from_func_name(dst, &chosen);
@ -84,16 +104,34 @@ pub(crate) fn try_known_rewrite_to_dst(
method: &str,
mut arg_values: Vec<ValueId>,
) -> Option<Result<ValueId, String>> {
if !rewrite_enabled() { return None; }
if builder.value_origin_newbox.get(&object_value).is_none() { return None; }
if !builder.user_defined_boxes.contains(cls) { return None; }
let allow_userbox_rewrite = std::env::var("NYASH_DEV_REWRITE_USERBOX").ok().as_deref() == Some("1");
let allow_new_origin = std::env::var("NYASH_DEV_REWRITE_NEW_ORIGIN").ok().as_deref() == Some("1");
if !rewrite_enabled() {
return None;
}
if builder.value_origin_newbox.get(&object_value).is_none() {
return None;
}
if !builder.user_defined_boxes.contains(cls) {
return None;
}
let allow_userbox_rewrite =
std::env::var("NYASH_DEV_REWRITE_USERBOX").ok().as_deref() == Some("1");
let allow_new_origin = std::env::var("NYASH_DEV_REWRITE_NEW_ORIGIN")
.ok()
.as_deref()
== Some("1");
let from_new_origin = builder.value_origin_newbox.get(&object_value).is_some();
let arity = arg_values.len();
let fname = crate::mir::builder::calls::function_lowering::generate_method_function_name(cls, method, arity);
let module_has = if let Some(ref module) = builder.current_module { module.functions.contains_key(&fname) } else { false };
if !((module_has || allow_userbox_rewrite) || (from_new_origin && allow_new_origin)) { return None; }
let fname = crate::mir::builder::calls::function_lowering::generate_method_function_name(
cls, method, arity,
);
let module_has = if let Some(ref module) = builder.current_module {
module.functions.contains_key(&fname)
} else {
false
};
if !((module_has || allow_userbox_rewrite) || (from_new_origin && allow_new_origin)) {
return None;
}
// unified global function call (module-local)
let mut call_args = Vec::with_capacity(arity + 1);
call_args.push(object_value);
@ -104,7 +142,9 @@ pub(crate) fn try_known_rewrite_to_dst(
Some(actual_dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(actual_dst, &fname);
let meta = serde_json::json!({
"recv_cls": cls,
@ -157,7 +197,9 @@ pub(crate) fn try_unique_suffix_rewrite(
Some(dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(dst, &fname);
let meta = serde_json::json!({
"recv_cls": builder.value_origin_newbox.get(&object_value).cloned().unwrap_or_default(),
@ -179,13 +221,26 @@ pub(crate) fn try_unique_suffix_rewrite_to_dst(
method: &str,
mut arg_values: Vec<ValueId>,
) -> Option<Result<ValueId, String>> {
if !rewrite_enabled() { return None; }
if builder.value_origin_newbox.get(&object_value).is_none() { return None; }
if !rewrite_enabled() {
return None;
}
if builder.value_origin_newbox.get(&object_value).is_none() {
return None;
}
let mut cands: Vec<String> = builder.method_candidates(method, arg_values.len());
if cands.len() != 1 { return None; }
if cands.len() != 1 {
return None;
}
let fname = cands.remove(0);
if let Some((bx, _)) = fname.split_once('.') { if !builder.user_defined_boxes.contains(bx) { return None; } } else { return None; }
let _name_const = match crate::mir::builder::name_const::make_name_const_result(builder, &fname) {
if let Some((bx, _)) = fname.split_once('.') {
if !builder.user_defined_boxes.contains(bx) {
return None;
}
} else {
return None;
}
let _name_const = match crate::mir::builder::name_const::make_name_const_result(builder, &fname)
{
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
@ -199,7 +254,9 @@ pub(crate) fn try_unique_suffix_rewrite_to_dst(
Some(actual_dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(actual_dst, &fname);
let meta = serde_json::json!({
"recv_cls": builder.value_origin_newbox.get(&object_value).cloned().unwrap_or_default(),
@ -223,7 +280,8 @@ pub(crate) fn try_known_or_unique(
arg_values: Vec<ValueId>,
) -> Option<Result<ValueId, String>> {
if let Some(cls) = class_name_opt.as_ref() {
if let Some(res) = try_known_rewrite(builder, object_value, cls, method, arg_values.clone()) {
if let Some(res) = try_known_rewrite(builder, object_value, cls, method, arg_values.clone())
{
return Some(res);
}
}
@ -240,7 +298,14 @@ pub(crate) fn try_known_or_unique_to_dst(
arg_values: Vec<ValueId>,
) -> Option<Result<ValueId, String>> {
if let Some(cls) = class_name_opt.as_ref() {
if let Some(res) = try_known_rewrite_to_dst(builder, want_dst, object_value, cls, method, arg_values.clone()) {
if let Some(res) = try_known_rewrite_to_dst(
builder,
want_dst,
object_value,
cls,
method,
arg_values.clone(),
) {
return Some(res);
}
}

1
src/mir/builder/rewrite/mod.rs
View File

@ -7,4 +7,3 @@
pub mod known;
pub mod special;

112
src/mir/builder/rewrite/special.rs
View File

@ -13,11 +13,21 @@ pub(crate) fn try_early_str_like(
if !(method == "toString" || method == "stringify") || arity != 0 {
return None;
}
let module = match &builder.current_module { Some(m) => m, None => return None };
let module = match &builder.current_module {
Some(m) => m,
None => return None,
};
// Prefer class-qualified str if we can infer class; fallback to stringify for互換
if let Some(cls) = class_name_opt.clone() {
let str_name = crate::mir::builder::calls::function_lowering::generate_method_function_name(&cls, "str", 0);
let compat_stringify = crate::mir::builder::calls::function_lowering::generate_method_function_name(&cls, "stringify", 0);
let str_name = crate::mir::builder::calls::function_lowering::generate_method_function_name(
&cls, "str", 0,
);
let compat_stringify =
crate::mir::builder::calls::function_lowering::generate_method_function_name(
&cls,
"stringify",
0,
);
let have_str = module.functions.contains_key(&str_name);
let have_compat = module.functions.contains_key(&compat_stringify);
if have_str || (!have_str && have_compat) {
@ -32,7 +42,7 @@ pub(crate) fn try_early_str_like(
"certainty": "Known",
});
super::super::observe::resolve::emit_choose(builder, meta);
// unified
// unified
let mut call_args = Vec::with_capacity(1);
call_args.push(object_value);
crate::mir::builder::ssa::local::finalize_args(builder, &mut call_args);
@ -41,7 +51,9 @@ pub(crate) fn try_early_str_like(
Some(dst),
crate::mir::builder::builder_calls::CallTarget::Global(chosen.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(dst, &chosen);
return Some(Ok(dst));
}
@ -71,7 +83,9 @@ pub(crate) fn try_early_str_like(
Some(dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(dst, &fname);
return Some(Ok(dst));
} else if cands.len() > 1 {
@ -95,7 +109,9 @@ pub(crate) fn try_early_str_like(
Some(dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(dst, &fname);
return Some(Ok(dst));
}
@ -113,10 +129,14 @@ pub(crate) fn try_special_equals(
method: &str,
args: Vec<super::super::ValueId>,
) -> Option<Result<super::super::ValueId, String>> {
if method != "equals" || args.len() != 1 { return None; }
if method != "equals" || args.len() != 1 {
return None;
}
// First, Known rewrite if possible
if let Some(cls) = class_name_opt.as_ref() {
if let Some(res) = super::known::try_known_rewrite(builder, object_value, cls, method, args.clone()) {
if let Some(res) =
super::known::try_known_rewrite(builder, object_value, cls, method, args.clone())
{
return Some(res);
}
}
@ -136,10 +156,20 @@ pub(crate) fn try_early_str_like_to_dst(
if !(method == "toString" || method == "stringify") || arity != 0 {
return None;
}
let module = match &builder.current_module { Some(m) => m, None => return None };
let module = match &builder.current_module {
Some(m) => m,
None => return None,
};
if let Some(cls) = class_name_opt.clone() {
let str_name = crate::mir::builder::calls::function_lowering::generate_method_function_name(&cls, "str", 0);
let compat_stringify = crate::mir::builder::calls::function_lowering::generate_method_function_name(&cls, "stringify", 0);
let str_name = crate::mir::builder::calls::function_lowering::generate_method_function_name(
&cls, "str", 0,
);
let compat_stringify =
crate::mir::builder::calls::function_lowering::generate_method_function_name(
&cls,
"stringify",
0,
);
let have_str = module.functions.contains_key(&str_name);
let have_compat = module.functions.contains_key(&compat_stringify);
if have_str || (!have_str && have_compat) {
@ -153,10 +183,11 @@ pub(crate) fn try_early_str_like_to_dst(
"certainty": "Known",
});
super::super::observe::resolve::emit_choose(builder, meta);
let _name_const = match crate::mir::builder::name_const::make_name_const_result(builder, &chosen) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let _name_const =
match crate::mir::builder::name_const::make_name_const_result(builder, &chosen) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let mut call_args = Vec::with_capacity(1);
call_args.push(object_value);
crate::mir::builder::ssa::local::finalize_args(builder, &mut call_args);
@ -165,7 +196,9 @@ pub(crate) fn try_early_str_like_to_dst(
Some(actual_dst),
crate::mir::builder::builder_calls::CallTarget::Global(chosen.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(actual_dst, &chosen);
return Some(Ok(actual_dst));
}
@ -184,10 +217,11 @@ pub(crate) fn try_early_str_like_to_dst(
"certainty": "Heuristic",
});
super::super::observe::resolve::emit_choose(builder, meta);
let _name_const = match crate::mir::builder::name_const::make_name_const_result(builder, &fname) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let _name_const =
match crate::mir::builder::name_const::make_name_const_result(builder, &fname) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let mut call_args = Vec::with_capacity(1);
call_args.push(object_value);
crate::mir::builder::ssa::local::finalize_args(builder, &mut call_args);
@ -196,7 +230,9 @@ pub(crate) fn try_early_str_like_to_dst(
Some(actual_dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(actual_dst, &fname);
return Some(Ok(actual_dst));
} else if cands.len() > 1 {
@ -211,19 +247,22 @@ pub(crate) fn try_early_str_like_to_dst(
"certainty": "Heuristic",
});
super::super::observe::resolve::emit_choose(builder, meta);
let _name_const = match crate::mir::builder::name_const::make_name_const_result(builder, &fname) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let mut call_args = Vec::with_capacity(1);
call_args.push(object_value);
crate::mir::builder::ssa::local::finalize_args(builder, &mut call_args);
let _name_const =
match crate::mir::builder::name_const::make_name_const_result(builder, &fname) {
Ok(v) => v,
Err(e) => return Some(Err(e)),
};
let mut call_args = Vec::with_capacity(1);
call_args.push(object_value);
crate::mir::builder::ssa::local::finalize_args(builder, &mut call_args);
let actual_dst = want_dst.unwrap_or_else(|| builder.next_value_id());
if let Err(e) = builder.emit_unified_call(
Some(actual_dst),
crate::mir::builder::builder_calls::CallTarget::Global(fname.clone()),
call_args,
) { return Some(Err(e)); }
) {
return Some(Err(e));
}
builder.annotate_call_result_from_func_name(actual_dst, &fname);
return Some(Ok(actual_dst));
}
@ -240,9 +279,18 @@ pub(crate) fn try_special_equals_to_dst(
method: &str,
args: Vec<super::super::ValueId>,
) -> Option<Result<super::super::ValueId, String>> {
if method != "equals" || args.len() != 1 { return None; }
if method != "equals" || args.len() != 1 {
return None;
}
if let Some(cls) = class_name_opt.as_ref() {
if let Some(res) = super::known::try_known_rewrite_to_dst(builder, want_dst, object_value, cls, method, args.clone()) {
if let Some(res) = super::known::try_known_rewrite_to_dst(
builder,
want_dst,
object_value,
cls,
method,
args.clone(),
) {
return Some(res);
}
}