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

feat(builder): CalleeBoxKind構造ガードで静的/ランタイムBox混線を根絶

Browse Source 
🎯 箱理論の実践: 「境界を作る」原則による構造レベル分離

## 問題
- StageBArgsBox.resolve_src内のargs.get(i)が
  Stage1UsingResolverBox.getに化ける（静的Box名混入）
- 未定義ValueIdエラー発生（receiver定義なし）

## 解決策（構造ガード）
✅ CalleeBoxKind enum追加
  - StaticCompiler: Stage-B/Stage-1コンパイラBox
  - RuntimeData: MapBox/ArrayBox等ランタイムBox
  - UserDefined: ユーザー定義Box

✅ classify_box_kind(): Box名から種別判定
  - 静的Box群を明示的に列挙（1箇所に集約）
  - ランタイムBox群を明示的に列挙
  - 将来の拡張も容易

✅ apply_static_runtime_guard(): 混線検出・正規化
  - me-call判定（receiver型==box_name → 静的降下に委ねる）
  - 真の混線検出（receiver型≠box_name → 正規化）
  - トレースログで可視化

## 効果
- 修正前: Invalid value ValueId(150/187)
- 修正後: Unknown method 'is_space' (別issue、StringBox実装不足)
- → 静的Box名混入問題を根絶！

## 箱理論原則
- ✅ 境界を作る: Static/Runtime/UserDefinedを構造的に分離
- ✅ Fail-Fast: フォールバックより明示的エラー
- ✅ 箱にする: CalleeBoxKindでBox種類を1箇所に集約

## ファイル
- src/mir/definitions/call_unified.rs: CalleeBoxKind enum
- src/mir/builder/calls/call_unified.rs: classify_box_kind()
- src/mir/builder/calls/emit.rs: apply_static_runtime_guard()
- docs/development/roadmap/phases/phase-25.1d/README.md: 箱化メモ更新

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

Co-Authored-By: Claude <noreply@anthropic.com>
This commit is contained in:
nyash-codex
2025-11-17 23:13:57 +09:00
parent 3e3e6318bb
commit 73844dbe04
16 changed files with 577 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/mir/builder/calls/emit.rs
View File

@ -89,6 +89,7 @@ impl MirBuilder {
target.clone(),
&self.value_origin_newbox,
&self.value_types,
Some(&self.type_registry), // 🎯 TypeRegistry を渡す
) {
Ok(c) => c,
Err(e) => {
@ -105,6 +106,10 @@ impl MirBuilder {
// Safety: ensure receiver is materialized even after callee conversion
callee = self.materialize_receiver_in_callee(callee)?;
// Structural guard: prevent static compiler boxes from being called with runtime receivers
// If box_kind is StaticCompiler but receiver has a runtime Box type, normalize to runtime
callee = self.apply_static_runtime_guard(callee)?;
// Emit resolve.choose for method callee (dev-only; default OFF)
if let Callee::Method { box_name, method, certainty, .. } = &callee {
let chosen = format!("{}.{}{}", box_name, method, format!("/{}", arity_for_try));
@ -123,7 +128,7 @@ impl MirBuilder {
call_unified::validate_call_args(&callee, &args)?;
// Stability guard: decide route via RouterPolicyBox (behavior-preserving rules)
if let Callee::Method { box_name, method, receiver: Some(r), certainty } = &callee {
if let Callee::Method { box_name, method, receiver: Some(r), certainty, .. } = &callee {
let route = crate::mir::builder::router::policy::choose_route(box_name, method, *certainty, arity_for_try);
if let crate::mir::builder::router::policy::Route::BoxCall = route {
if super::super::utils::builder_debug_enabled() || std::env::var("NYASH_LOCAL_SSA_TRACE").ok().as_deref() == Some("1") {
@ -368,7 +373,7 @@ impl MirBuilder {
callee: Callee,
) -> Result<Callee, String> {
match callee {
Callee::Method { box_name, method, receiver: Some(r), certainty } => {
Callee::Method { box_name, method, receiver: Some(r), certainty, box_kind } => {
if std::env::var("NYASH_BUILDER_TRACE_RECV").ok().as_deref() == Some("1") {
let current_fn = self
.current_function
@ -401,7 +406,7 @@ impl MirBuilder {
}
// Prefer pinning to a slot so start_new_block can propagate it across entries.
let r_pinned = self.pin_to_slot(r, "@recv").unwrap_or(r);
Ok(Callee::Method { box_name, method, receiver: Some(r_pinned), certainty })
Ok(Callee::Method { box_name, method, receiver: Some(r_pinned), certainty, box_kind })
}
other => Ok(other),
}
@ -449,4 +454,60 @@ impl MirBuilder {
effects: EffectMask::IO,
})
}
/// Structural guard: prevent static compiler boxes from mixing with runtime data boxes
///
/// 箱理論の「境界を作る」原則: Stage-B/Stage-1コンパイラBoxとランタイムDataBoxを
/// 構造レベルで分離し、型メタデータの混入を防ぐ。
///
/// If box_kind is StaticCompiler but receiver has a runtime Box type (MapBox/ArrayBox/etc.),
/// normalize box_name to the runtime type. This prevents cases like:
/// - Stage1UsingResolverBox.get where receiver is actually MapBox
/// - StageBArgsBox.length where receiver is actually ArrayBox
///
/// This is a Fail-Fast structural guard, not a fallback.
fn apply_static_runtime_guard(&self, callee: Callee) -> Result<Callee, String> {
use crate::mir::definitions::call_unified::CalleeBoxKind;
if let Callee::Method { ref box_name, ref method, receiver: Some(recv), certainty, box_kind } = callee {
// Only apply guard if box_kind is StaticCompiler
if box_kind == CalleeBoxKind::StaticCompiler {
// Check if receiver has a Box type
if let Some(crate::mir::MirType::Box(receiver_box)) = self.value_types.get(&recv) {
let trace_enabled = std::env::var("NYASH_CALLEE_RESOLVE_TRACE").ok().as_deref() == Some("1");
// If receiver box type matches the static box name, this is a me-call
// Let it through for static method lowering (don't normalize)
if receiver_box == box_name {
if trace_enabled {
eprintln!("[static-runtime-guard] ME-CALL detected:");
eprintln!(" {}.{} with receiver type: {} (same as box_name)", box_name, method, receiver_box);
eprintln!(" → Allowing for static method lowering");
}
return Ok(callee); // Pass through unchanged
}
// Otherwise, this is a true mix-up: runtime box with static box name
// Normalize to the runtime box type
if trace_enabled {
eprintln!("[static-runtime-guard] CORRECTING mix-up:");
eprintln!(" Original: {}.{} (box_kind=StaticCompiler)", box_name, method);
eprintln!(" Receiver %{} has runtime type: {}", recv.0, receiver_box);
eprintln!(" Normalized: {}.{}", receiver_box, method);
}
return Ok(Callee::Method {
box_name: receiver_box.clone(),
method: method.clone(),
receiver: Some(recv),
certainty,
box_kind: CalleeBoxKind::RuntimeData, // Switch to runtime
});
}
}
}
// No guard needed, return as-is
Ok(callee)
}
}