tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions 1 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

154
src/mir/builder/calls/resolver.rs
View File

@ -12,11 +12,11 @@
* - Call引数検証
*/
use crate::mir::{Callee, MirType, ValueId};
use super::method_resolution;
use crate::mir::builder::type_registry::TypeRegistry;
use crate::mir::builder::CallTarget;
use crate::mir::definitions::call_unified::{CalleeBoxKind, TypeCertainty};
use crate::mir::builder::type_registry::TypeRegistry;
use super::method_resolution;
use crate::mir::{Callee, MirType, ValueId};
use std::collections::HashMap;
/// Callee解決専用箱
@ -56,9 +56,7 @@ impl<'a> CalleeResolverBox<'a> {
///
/// 🎯 TypeRegistry対応: NYASH_USE_TYPE_REGISTRY=1 で registry 優先
pub fn resolve(&self, target: CallTarget) -> Result<Callee, String> {
let use_registry = std::env::var("NYASH_USE_TYPE_REGISTRY")
.ok()
.as_deref() == Some("1");
let use_registry = std::env::var("NYASH_USE_TYPE_REGISTRY").ok().as_deref() == Some("1");
match target {
CallTarget::Global(name) => {
@ -71,27 +69,36 @@ impl<'a> CalleeResolverBox<'a> {
// Module-local or static lowered function (e.g., "Box.method/N")
Ok(Callee::Global(name))
}
},
}
CallTarget::Method { box_type, method, receiver } => {
CallTarget::Method {
box_type,
method,
receiver,
} => {
// 🔍 Debug: trace box_name resolution
let trace_enabled = std::env::var("NYASH_CALLEE_RESOLVE_TRACE")
.ok()
.as_deref() == Some("1");
let trace_enabled =
std::env::var("NYASH_CALLEE_RESOLVE_TRACE").ok().as_deref() == Some("1");
if trace_enabled {
eprintln!("[callee-resolve] receiver=%{} method={}", receiver.0, method);
eprintln!(
"[callee-resolve] receiver=%{} method={}",
receiver.0, method
);
eprintln!("[callee-resolve] explicit box_type: {:?}", box_type);
eprintln!("[callee-resolve] use_registry: {}", use_registry);
}
let inferred_box_type = self.infer_box_type(receiver, box_type, trace_enabled, use_registry);
let inferred_box_type =
self.infer_box_type(receiver, box_type, trace_enabled, use_registry);
// Certainty is Known when we have explicit origin or Box型の型情報を持つ場合
let has_box_type = self.value_types
let has_box_type = self
.value_types
.get(&receiver)
.map(|t| matches!(t, MirType::Box(_)))
.unwrap_or(false);
let certainty = if self.value_origin_newbox.contains_key(&receiver) || has_box_type {
let certainty = if self.value_origin_newbox.contains_key(&receiver) || has_box_type
{
TypeCertainty::Known
} else {
TypeCertainty::Union
@ -101,7 +108,10 @@ impl<'a> CalleeResolverBox<'a> {
let box_kind = self.classify_box_kind(&inferred_box_type);
if trace_enabled {
eprintln!("[callee-resolve] inferred_box_name: {}", inferred_box_type);
eprintln!(
"[callee-resolve] inferred_box_name: {}",
inferred_box_type
);
eprintln!("[callee-resolve] box_kind: {:?}", box_kind);
}
@ -112,23 +122,23 @@ impl<'a> CalleeResolverBox<'a> {
certainty,
box_kind,
})
},
}
CallTarget::Constructor(box_type) => {
Ok(Callee::Constructor { box_type })
},
CallTarget::Constructor(box_type) => Ok(Callee::Constructor { box_type }),
CallTarget::Extern(name) => {
Ok(Callee::Extern(name))
},
CallTarget::Extern(name) => Ok(Callee::Extern(name)),
CallTarget::Value(func_val) => {
Ok(Callee::Value(func_val))
},
CallTarget::Value(func_val) => Ok(Callee::Value(func_val)),
CallTarget::Closure { params, captures, me_capture } => {
Ok(Callee::Closure { params, captures, me_capture })
},
CallTarget::Closure {
params,
captures,
me_capture,
} => Ok(Callee::Closure {
params,
captures,
me_capture,
}),
}
}
@ -183,14 +193,18 @@ impl<'a> CalleeResolverBox<'a> {
}
"exit" => {
if args.len() != 1 {
return Err("exit requires exactly one argument (exit code)".to_string());
return Err(
"exit requires exactly one argument (exit code)".to_string()
);
}
}
_ => {} // Unknown functions pass through
}
},
}
Callee::Method { box_name, method, .. } => {
Callee::Method {
box_name, method, ..
} => {
// Validate known methods
match (box_name.as_str(), method.as_str()) {
("ArrayBox", "get") | ("ArrayBox", "set") => {
@ -200,7 +214,7 @@ impl<'a> CalleeResolverBox<'a> {
}
_ => {} // Unknown methods pass through
}
},
}
_ => {} // Other callee types don't have validation yet
}
@ -240,12 +254,10 @@ impl<'a> CalleeResolverBox<'a> {
}
// 従来: HashMap から推論（型情報を優先し、origin は補助とする）
let from_type = self.value_types
.get(&receiver)
.and_then(|t| match t {
MirType::Box(box_name) => Some(box_name.clone()),
_ => None,
});
let from_type = self.value_types.get(&receiver).and_then(|t| match t {
MirType::Box(box_name) => Some(box_name.clone()),
_ => None,
});
let from_origin = self.value_origin_newbox.get(&receiver).cloned();
if trace_enabled {
@ -254,14 +266,12 @@ impl<'a> CalleeResolverBox<'a> {
}
// 型情報（MirType）がある場合はそれを優先し、無い場合のみ origin にフォールバックする。
from_type
.or(from_origin)
.unwrap_or_else(|| {
if trace_enabled {
eprintln!("[callee-resolve] FALLBACK: UnknownBox");
}
"UnknownBox".to_string()
})
from_type.or(from_origin).unwrap_or_else(|| {
if trace_enabled {
eprintln!("[callee-resolve] FALLBACK: UnknownBox");
}
"UnknownBox".to_string()
})
})
}
}
@ -277,14 +287,26 @@ mod tests {
let resolver = CalleeResolverBox::new(&value_origin, &value_types, None);
// Stage-B boxes
assert_eq!(resolver.classify_box_kind("StageBArgsBox"), CalleeBoxKind::StaticCompiler);
assert_eq!(resolver.classify_box_kind("StageBDriverBox"), CalleeBoxKind::StaticCompiler);
assert_eq!(
resolver.classify_box_kind("StageBArgsBox"),
CalleeBoxKind::StaticCompiler
);
assert_eq!(
resolver.classify_box_kind("StageBDriverBox"),
CalleeBoxKind::StaticCompiler
);
// Stage-1 boxes
assert_eq!(resolver.classify_box_kind("Stage1UsingResolverBox"), CalleeBoxKind::StaticCompiler);
assert_eq!(
resolver.classify_box_kind("Stage1UsingResolverBox"),
CalleeBoxKind::StaticCompiler
);
// Parser boxes
assert_eq!(resolver.classify_box_kind("ParserBox"), CalleeBoxKind::StaticCompiler);
assert_eq!(
resolver.classify_box_kind("ParserBox"),
CalleeBoxKind::StaticCompiler
);
}
#[test]
@ -293,10 +315,22 @@ mod tests {
let value_types = HashMap::new();
let resolver = CalleeResolverBox::new(&value_origin, &value_types, None);
assert_eq!(resolver.classify_box_kind("MapBox"), CalleeBoxKind::RuntimeData);
assert_eq!(resolver.classify_box_kind("ArrayBox"), CalleeBoxKind::RuntimeData);
assert_eq!(resolver.classify_box_kind("StringBox"), CalleeBoxKind::RuntimeData);
assert_eq!(resolver.classify_box_kind("UnknownBox"), CalleeBoxKind::RuntimeData);
assert_eq!(
resolver.classify_box_kind("MapBox"),
CalleeBoxKind::RuntimeData
);
assert_eq!(
resolver.classify_box_kind("ArrayBox"),
CalleeBoxKind::RuntimeData
);
assert_eq!(
resolver.classify_box_kind("StringBox"),
CalleeBoxKind::RuntimeData
);
assert_eq!(
resolver.classify_box_kind("UnknownBox"),
CalleeBoxKind::RuntimeData
);
}
#[test]
@ -305,8 +339,14 @@ mod tests {
let value_types = HashMap::new();
let resolver = CalleeResolverBox::new(&value_origin, &value_types, None);
assert_eq!(resolver.classify_box_kind("MyCustomBox"), CalleeBoxKind::UserDefined);
assert_eq!(resolver.classify_box_kind("PersonBox"), CalleeBoxKind::UserDefined);
assert_eq!(
resolver.classify_box_kind("MyCustomBox"),
CalleeBoxKind::UserDefined
);
assert_eq!(
resolver.classify_box_kind("PersonBox"),
CalleeBoxKind::UserDefined
);
}
#[test]