feat(joinir): Phase 200-B/C/D capture analysis + Phase 201-A reserved_value_ids infra
Phase 200-B: FunctionScopeCaptureAnalyzer implementation - analyze_captured_vars_v2() with structural loop matching - CapturedEnv for immutable function-scope variables - ParamRole::Condition for condition-only variables Phase 200-C: ConditionEnvBuilder extension - build_with_captures() integrates CapturedEnv into ConditionEnv - fn_body propagation through LoopPatternContext to Pattern 2 Phase 200-D: E2E verification - capture detection working for base, limit, n etc. - Test files: phase200d_capture_minimal.hako, phase200d_capture_in_condition.hako Phase 201-A: MirBuilder reserved_value_ids infrastructure - reserved_value_ids: HashSet<ValueId> field in MirBuilder - next_value_id() skips reserved IDs - merge/mod.rs sets/clears reserved IDs around JoinIR merge Phase 201: JoinValueSpace design document - Param/Local/PHI disjoint regions design - API: alloc_param(), alloc_local(), reserve_phi() - Migration plan for Pattern 1-4 lowerers 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
nyash-codex
@ -208,6 +208,47 @@ JoinIR ラインで守るべきルールを先に書いておくよ：
|
||||
|
||||
### 2.3 キャリア / Exit / Boundary ライン
|
||||
|
||||
- **Phase 200-B: FunctionScopeCaptureAnalyzer (完了)**
|
||||
- ファイル: `src/mir/loop_pattern_detection/function_scope_capture.rs`
|
||||
- 責務: 関数スコープの「実質定数」を検出
|
||||
- 判定条件:
|
||||
1. 関数トップレベルで 1 回だけ定義
|
||||
2. ループ内で再代入なし
|
||||
3. 安全な初期式（文字列/整数リテラル）のみ
|
||||
- 結果: CapturedEnv に name, host_id, is_immutable を格納
|
||||
- **ConditionEnvBuilder v2**:
|
||||
- 責務: CapturedEnv から ParamRole::Condition として ConditionEnv に追加
|
||||
- 経路: analyze_captured_vars → build_with_captures → ConditionEnv.captured
|
||||
- 不変条件: Condition role は Header PHI / ExitLine の対象にならない
|
||||
- **Pattern 2 統合**: Phase 200-C で完了 ✅
|
||||
- MirBuilder.fn_body_ast フィールド追加
|
||||
- LoopPatternContext.fn_body 経由で Pattern 2 lowerer に渡す
|
||||
- analyze_captured_vars_v2() で構造的ループ検索（ポインタ比較 → AST 構造比較）
|
||||
|
||||
- **Phase 200-C: digits.indexOf E2E 連携 (完了)**
|
||||
- 目的: 200-A/B インフラを実際に Pattern 2 経路に統合
|
||||
- 実装:
|
||||
- fn_body を MirBuilder → LoopPatternContext → Pattern 2 に渡す
|
||||
- analyze_captured_vars_v2() で構造的マッチング（AST Debug 文字列比較）
|
||||
- digits / s 等の関数ローカル定数が CapturedEnv に正しく捕捉される
|
||||
- 検証結果:
|
||||
- capture 検出: ✅ PASS
|
||||
- E2E 実行: ❌ BLOCKED（テストケースが Pattern 5+ 必要）
|
||||
- テストケース制約:
|
||||
- phase200_digits_atoi_min.hako: body-local `pos` を条件 `if pos < 0` で使用
|
||||
- → Pattern 5 (body-local promotion) が必要
|
||||
|
||||
- **Phase 200-D: digits capture "実戦 1 本" 検証 (完了)**
|
||||
- 目的: capture 経路の E2E 検証（body-local なしのシンプルケース）
|
||||
- 検証結果:
|
||||
- capture 検出: ✅ PASS（base, limit, n 等が正しく CapturedEnv に）
|
||||
- ConditionEnv 統合: ✅ PASS（captured vars が ConditionEnv.captured に追加）
|
||||
- 実行: ⚠️ 別の制約でブロック（substring 未対応、キャリア更新型問題）
|
||||
- 成果:
|
||||
- capture 経路（analyze_captured_vars_v2 → ConditionEnv → Pattern 2）が正常動作
|
||||
- 関数スコープ定数が正しく検出・統合される
|
||||
- テストファイル: phase200d_capture_minimal.hako, phase200d_capture_in_condition.hako
|
||||
|
||||
- **CarrierInfo / LoopUpdateAnalyzer / CarrierUpdateEmitter**
|
||||
- ファイル:
|
||||
- `src/mir/join_ir/lowering/carrier_info.rs`
|
||||
|
||||
529
docs/development/current/main/phase200-B-capture-impl.md
Normal file
529
docs/development/current/main/phase200-B-capture-impl.md
Normal file
@ -0,0 +1,529 @@
|
||||
# Phase 200-B: FunctionScopeCaptureAnalyzer 実装 & ConditionEnv 統合
|
||||
|
||||
**Date**: 2025-12-09
|
||||
**Status**: Ready for Implementation
|
||||
**Prerequisite**: Phase 200-A complete
|
||||
|
||||
---
|
||||
|
||||
## ゴール
|
||||
|
||||
1. **CapturedEnv に「安全にキャプチャできる関数ローカル」を実際に埋める**
|
||||
2. **ConditionEnv / JoinInlineBoundaryBuilder に統合して、`digits` みたいな変数を JoinIR 側から参照できるようにする**
|
||||
3. **影響範囲は `_parse_number` / `_atoi` の最小ケースに限定、挙動は Fail-Fast を維持**
|
||||
|
||||
**スコープ制限**:
|
||||
- ✅ ConditionEnv に digits を見せられるようにする
|
||||
- ❌ `digits.indexOf(ch)` の E2E 動作は Phase 200-C（ComplexAddendNormalizer 連携）
|
||||
|
||||
---
|
||||
|
||||
## Task 200-B-1: capture 判定ロジック実装
|
||||
|
||||
### 対象ファイル
|
||||
`src/mir/loop_pattern_detection/function_scope_capture.rs`（Phase 200-A で作ったスケルトン）
|
||||
|
||||
### 実装内容
|
||||
|
||||
`analyze_captured_vars(fn_body, loop_ast, scope) -> CapturedEnv` を実装する。
|
||||
|
||||
**判定条件（全部満たしたものだけ許可）**:
|
||||
|
||||
1. **関数トップレベルで `local name = <expr>;` として 1 回だけ定義されている**
|
||||
- ループより前の位置で定義
|
||||
- 複数回定義されていない
|
||||
|
||||
2. **その変数 `name` はループ本体（条件含む）で読み取りのみ（再代入なし）**
|
||||
- ループ内で `name = ...` が存在しない
|
||||
|
||||
3. **`<expr>` は「安全な初期式」だけ**:
|
||||
- 文字列リテラル `"0123456789"`
|
||||
- 整数リテラル `123`
|
||||
- 将来拡張を見越して Const 系だけにしておく（MethodCall 等はまだ対象外）
|
||||
|
||||
### 実装アルゴリズム
|
||||
|
||||
```rust
|
||||
pub fn analyze_captured_vars(
|
||||
fn_body: &[Stmt],
|
||||
loop_ast: &Stmt,
|
||||
scope: &LoopScopeShape,
|
||||
) -> CapturedEnv {
|
||||
let mut env = CapturedEnv::new();
|
||||
|
||||
// Step 1: Find loop position in fn_body
|
||||
let loop_index = find_stmt_index(fn_body, loop_ast);
|
||||
|
||||
// Step 2: Collect local declarations BEFORE the loop
|
||||
let pre_loop_locals = collect_local_declarations(&fn_body[..loop_index]);
|
||||
|
||||
// Step 3: For each pre-loop local, check:
|
||||
for local in pre_loop_locals {
|
||||
// 3a: Is init expression a safe constant?
|
||||
if !is_safe_const_init(&local.init) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 3b: Is this variable reassigned anywhere in fn_body?
|
||||
if is_reassigned_in_fn(fn_body, &local.name) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 3c: Is this variable used in loop (condition or body)?
|
||||
if !is_used_in_loop(loop_ast, &local.name) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// 3d: Skip if already in LoopParam or LoopBodyLocal
|
||||
if scope.loop_params.contains(&local.name) || scope.body_locals.contains(&local.name) {
|
||||
continue;
|
||||
}
|
||||
|
||||
// All checks passed: add to CapturedEnv
|
||||
env.add_var(CapturedVar {
|
||||
name: local.name.clone(),
|
||||
host_id: local.value_id, // From scope/variable_map
|
||||
is_immutable: true,
|
||||
});
|
||||
}
|
||||
|
||||
env
|
||||
}
|
||||
|
||||
/// Check if expression is a safe constant (string/integer literal)
|
||||
fn is_safe_const_init(expr: &Option<Expr>) -> bool {
|
||||
match expr {
|
||||
Some(Expr::StringLiteral(_)) => true,
|
||||
Some(Expr::IntegerLiteral(_)) => true,
|
||||
_ => false,
|
||||
}
|
||||
}
|
||||
|
||||
/// Check if variable is reassigned anywhere in function body
|
||||
fn is_reassigned_in_fn(fn_body: &[Stmt], name: &str) -> bool {
|
||||
// Walk all statements, check for `name = ...` (excluding initial declaration)
|
||||
// Implementation uses AST visitor pattern
|
||||
}
|
||||
|
||||
/// Check if variable is referenced in loop condition or body
|
||||
fn is_used_in_loop(loop_ast: &Stmt, name: &str) -> bool {
|
||||
// Walk loop AST, check for Identifier(name) references
|
||||
}
|
||||
```
|
||||
|
||||
### ユニットテスト
|
||||
|
||||
```rust
|
||||
#[test]
|
||||
fn test_capture_simple_digits() {
|
||||
// local digits = "0123456789"
|
||||
// loop(i < 10) { digits.indexOf(ch) }
|
||||
// → 1 var captured (digits)
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_capture_reassigned_rejected() {
|
||||
// local digits = "0123456789"
|
||||
// digits = "abc" // reassignment
|
||||
// loop(i < 10) { digits.indexOf(ch) }
|
||||
// → 0 vars captured
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_capture_after_loop_rejected() {
|
||||
// loop(i < 10) { ... }
|
||||
// local digits = "0123456789" // defined AFTER loop
|
||||
// → 0 vars captured
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_capture_method_call_init_rejected() {
|
||||
// local result = someBox.getValue() // MethodCall init
|
||||
// loop(i < 10) { result.indexOf(ch) }
|
||||
// → 0 vars captured (not safe const)
|
||||
}
|
||||
```
|
||||
|
||||
### 成果物
|
||||
- [x] `analyze_captured_vars` 本実装
|
||||
- [x] ヘルパ関数（`is_safe_const_init`, `is_reassigned_in_fn`, `is_used_in_loop`）
|
||||
- [x] 4+ unit tests
|
||||
|
||||
---
|
||||
|
||||
## Task 200-B-2: ConditionEnvBuilder v2 実装
|
||||
|
||||
### 対象ファイル
|
||||
`src/mir/builder/control_flow/joinir/patterns/condition_env_builder.rs`
|
||||
|
||||
### 実装内容
|
||||
|
||||
`build_with_captures(loop_var_name, captured, boundary) -> ConditionEnv` を本実装にする。
|
||||
|
||||
```rust
|
||||
pub fn build_with_captures(
|
||||
loop_var_name: &str,
|
||||
captured: &CapturedEnv,
|
||||
boundary: &mut JoinInlineBoundaryBuilder,
|
||||
) -> ConditionEnv {
|
||||
// Step 1: Build base ConditionEnv with loop params (existing logic)
|
||||
let mut env = build_loop_param_only(loop_var_name, boundary);
|
||||
|
||||
// Step 2: Add captured vars as ParamRole::Condition
|
||||
for var in &captured.vars {
|
||||
// 2a: Add to boundary with Condition role
|
||||
boundary.add_param_with_role(&var.name, var.host_id, ParamRole::Condition);
|
||||
|
||||
// 2b: Add to ConditionEnv.captured map
|
||||
// Need JoinIR ValueId from boundary/remapper
|
||||
let join_id = boundary.get_condition_binding(&var.name)
|
||||
.expect("captured var should be in boundary");
|
||||
env.captured.insert(var.name.clone(), join_id);
|
||||
}
|
||||
|
||||
// Step 3: Debug guard - Condition params must NOT be in PHI candidates
|
||||
#[cfg(debug_assertions)]
|
||||
for var in &captured.vars {
|
||||
assert!(
|
||||
!env.params.contains_key(&var.name),
|
||||
"Captured var '{}' must not be in loop params (ParamRole conflict)",
|
||||
var.name
|
||||
);
|
||||
}
|
||||
|
||||
env
|
||||
}
|
||||
```
|
||||
|
||||
### ConditionEnv 拡張
|
||||
|
||||
```rust
|
||||
pub struct ConditionEnv {
|
||||
pub params: BTreeMap<String, ValueId>, // LoopParam (existing)
|
||||
pub captured: BTreeMap<String, ValueId>, // NEW: Captured vars (ParamRole::Condition)
|
||||
}
|
||||
|
||||
impl ConditionEnv {
|
||||
/// Look up a variable (params first, then captured)
|
||||
pub fn get(&self, name: &str) -> Option<ValueId> {
|
||||
self.params.get(name).copied()
|
||||
.or_else(|| self.captured.get(name).copied())
|
||||
}
|
||||
|
||||
/// Check if variable is a captured (Condition role) var
|
||||
pub fn is_captured(&self, name: &str) -> bool {
|
||||
self.captured.contains_key(name)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### JoinInlineBoundaryBuilder 更新
|
||||
|
||||
```rust
|
||||
impl JoinInlineBoundaryBuilder {
|
||||
pub fn add_param_with_role(&mut self, name: &str, host_id: ValueId, role: ParamRole) {
|
||||
match role {
|
||||
ParamRole::LoopParam | ParamRole::Carrier => {
|
||||
// Existing: add to join_inputs
|
||||
self.add_input(name, host_id);
|
||||
}
|
||||
ParamRole::Condition => {
|
||||
// NEW: Add to condition_bindings only (no PHI, no ExitLine)
|
||||
let join_id = self.alloc_value(); // Allocate JoinIR ValueId
|
||||
self.condition_bindings.push(ConditionBinding {
|
||||
name: name.to_string(),
|
||||
host_id,
|
||||
join_id,
|
||||
role: ParamRole::Condition,
|
||||
});
|
||||
}
|
||||
ParamRole::ExprResult => {
|
||||
// Handled by set_expr_result
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn get_condition_binding(&self, name: &str) -> Option<ValueId> {
|
||||
self.condition_bindings.iter()
|
||||
.find(|b| b.name == name)
|
||||
.map(|b| b.join_id)
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### ユニットテスト
|
||||
|
||||
```rust
|
||||
#[test]
|
||||
fn test_build_with_empty_captures() {
|
||||
// CapturedEnv empty → same as existing build
|
||||
let captured = CapturedEnv::new();
|
||||
let env = build_with_captures("i", &captured, &mut builder);
|
||||
assert!(env.captured.is_empty());
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_build_with_digits_capture() {
|
||||
// CapturedEnv with "digits"
|
||||
let mut captured = CapturedEnv::new();
|
||||
captured.add_var(CapturedVar {
|
||||
name: "digits".to_string(),
|
||||
host_id: ValueId(42),
|
||||
is_immutable: true,
|
||||
});
|
||||
|
||||
let env = build_with_captures("i", &captured, &mut builder);
|
||||
|
||||
// Verify captured var is in ConditionEnv
|
||||
assert!(env.captured.contains_key("digits"));
|
||||
|
||||
// Verify boundary has Condition role
|
||||
let binding = builder.get_condition_binding("digits").unwrap();
|
||||
// binding should exist with ParamRole::Condition
|
||||
}
|
||||
```
|
||||
|
||||
### 成果物
|
||||
- [x] `build_with_captures` 本実装
|
||||
- [x] `ConditionEnv.captured` フィールド追加
|
||||
- [x] `add_param_with_role` の Condition ブランチ実装
|
||||
- [x] 2+ unit tests
|
||||
|
||||
---
|
||||
|
||||
## Task 200-B-3: パイプライン組み込み
|
||||
|
||||
### 対象
|
||||
PatternPipelineContext / Pattern lowerer の「前処理パス」
|
||||
|
||||
### 実装内容
|
||||
|
||||
Pattern 決定後、JoinIR lowering に入る前の箇所で capture 解析を挿入。
|
||||
|
||||
```rust
|
||||
// In pattern lowerer (e.g., pattern2_with_break.rs)
|
||||
|
||||
// Step 1: Existing - build PatternPipelineContext
|
||||
let pipeline_ctx = PatternPipelineContext::new(/* ... */);
|
||||
|
||||
// Step 2: NEW - Analyze captured vars
|
||||
let captured = analyze_captured_vars(
|
||||
&fn_body, // Function body statements
|
||||
&loop_ast, // Loop AST
|
||||
&pipeline_ctx.loop_scope,
|
||||
);
|
||||
|
||||
// Step 3: Build ConditionEnv with captures
|
||||
let cond_env = build_with_captures(
|
||||
&pipeline_ctx.loop_var_name,
|
||||
&captured,
|
||||
&mut boundary_builder,
|
||||
);
|
||||
|
||||
// Step 4: Proceed with JoinIR lowering using cond_env
|
||||
```
|
||||
|
||||
### 段階適用（今フェーズ）
|
||||
|
||||
- **Pattern 2 のみに適用**（`_parse_number` / `_atoi` 向け）
|
||||
- 他パターン（P1/P3/P4）は既存 ConditionEnv のまま（影響なし）
|
||||
|
||||
### テストファイル whitelist
|
||||
|
||||
```rust
|
||||
// routing.rs に追加（必要な場合）
|
||||
// Phase 200-B: digits capture test cases
|
||||
"phase200_digits_atoi_min",
|
||||
"phase200_digits_parse_number_min",
|
||||
```
|
||||
|
||||
### 成果物
|
||||
- [x] Pattern 2 に capture 解析パス追加
|
||||
- [x] 必要に応じて whitelist 更新
|
||||
|
||||
---
|
||||
|
||||
## Task 200-B-4: digits ケース検証
|
||||
|
||||
### テストファイル作成
|
||||
|
||||
#### `apps/tests/phase200_digits_atoi_min.hako`
|
||||
|
||||
```nyash
|
||||
// Phase 200-B: Minimal atoi with digits capture
|
||||
static box Main {
|
||||
main() {
|
||||
local s = "123"
|
||||
local digits = "0123456789" // ← Captured var
|
||||
|
||||
local i = 0
|
||||
local v = 0
|
||||
local n = s.length()
|
||||
|
||||
loop(i < n) {
|
||||
local ch = s.substring(i, i+1)
|
||||
local pos = digits.indexOf(ch) // ← Uses captured digits
|
||||
|
||||
if pos < 0 {
|
||||
break
|
||||
}
|
||||
|
||||
v = v * 10 + pos
|
||||
i = i + 1
|
||||
}
|
||||
|
||||
print(v) // Expected: 123
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### `apps/tests/phase200_digits_parse_number_min.hako`
|
||||
|
||||
```nyash
|
||||
// Phase 200-B: Minimal parse_number with digits capture
|
||||
static box Main {
|
||||
main() {
|
||||
local s = "42abc"
|
||||
local digits = "0123456789" // ← Captured var
|
||||
|
||||
local p = 0
|
||||
local num_str = ""
|
||||
local n = s.length()
|
||||
|
||||
loop(p < n) {
|
||||
local ch = s.substring(p, p+1)
|
||||
local digit_pos = digits.indexOf(ch) // ← Uses captured digits
|
||||
|
||||
if digit_pos < 0 {
|
||||
break
|
||||
}
|
||||
|
||||
num_str = num_str + ch
|
||||
p = p + 1
|
||||
}
|
||||
|
||||
print(num_str) // Expected: "42"
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
### 検証手順
|
||||
|
||||
```bash
|
||||
# Step 1: 構造トレース（Pattern 選択確認）
|
||||
NYASH_JOINIR_CORE=1 NYASH_JOINIR_STRUCTURE_ONLY=1 ./target/release/hakorune \
|
||||
apps/tests/phase200_digits_atoi_min.hako 2>&1 | head -30
|
||||
|
||||
# Expected: Pattern 2 selected, NO [joinir/freeze]
|
||||
|
||||
# Step 2: Capture trace（digits が捕捉されているか）
|
||||
NYASH_JOINIR_CORE=1 NYASH_CAPTURE_DEBUG=1 ./target/release/hakorune \
|
||||
apps/tests/phase200_digits_atoi_min.hako 2>&1 | grep -i "capture"
|
||||
|
||||
# Expected: [capture] Found: digits (host_id=XX, is_immutable=true)
|
||||
|
||||
# Step 3: E2E 実行
|
||||
NYASH_JOINIR_CORE=1 ./target/release/hakorune apps/tests/phase200_digits_atoi_min.hako
|
||||
|
||||
# Phase 200-B Goal: digits がConditionEnv に見えていることを確認
|
||||
# E2E 動作は Phase 200-C（ComplexAddendNormalizer + digits.indexOf 連携）
|
||||
```
|
||||
|
||||
### 期待される結果
|
||||
|
||||
**Phase 200-B のゴール達成**:
|
||||
- ✅ `digits` が CapturedEnv に捕捉される
|
||||
- ✅ `digits` が ConditionEnv.captured に存在する
|
||||
- ✅ boundary に ParamRole::Condition として登録される
|
||||
|
||||
**Phase 200-C への引き継ぎ**:
|
||||
- ⚠️ `digits.indexOf(ch)` の E2E 動作はまだ Fail-Fast の可能性あり
|
||||
- → ComplexAddendNormalizer が MethodCall を扱えるようにする必要あり
|
||||
|
||||
### 成果物
|
||||
- [x] `phase200_digits_atoi_min.hako` テストファイル
|
||||
- [x] `phase200_digits_parse_number_min.hako` テストファイル
|
||||
- [x] 構造トレース確認
|
||||
- [x] Capture debug 確認
|
||||
|
||||
---
|
||||
|
||||
## Task 200-B-5: ドキュメント更新
|
||||
|
||||
### 1. joinir-architecture-overview.md
|
||||
|
||||
**Section 2.3 に追記**:
|
||||
|
||||
```markdown
|
||||
- **FunctionScopeCaptureAnalyzer** (Phase 200-B 実装完了)
|
||||
- 責務: 関数スコープの「実質定数」を検出
|
||||
- 判定条件:
|
||||
1. 関数トップレベルで 1 回だけ定義
|
||||
2. ループ内で再代入なし
|
||||
3. 安全な初期式（文字列/整数リテラル）のみ
|
||||
- 結果: CapturedEnv に name, host_id, is_immutable を格納
|
||||
|
||||
- **ConditionEnvBuilder v2** (Phase 200-B 実装完了)
|
||||
- 責務: CapturedEnv から ParamRole::Condition として ConditionEnv に追加
|
||||
- 経路: analyze_captured_vars → build_with_captures → ConditionEnv.captured
|
||||
- 不変条件: Condition role は Header PHI / ExitLine の対象にならない
|
||||
```
|
||||
|
||||
### 2. CURRENT_TASK.md
|
||||
|
||||
```markdown
|
||||
- [x] **Phase 200-B: FunctionScopeCaptureAnalyzer 実装 & ConditionEnv 統合** ✅ (完了: 2025-12-XX)
|
||||
- **目的**: digits 等の関数ローカルを ConditionEnv から参照可能に
|
||||
- **実装内容**:
|
||||
- 200-B-1: capture 判定ロジック実装 ✅
|
||||
- 200-B-2: ConditionEnvBuilder v2 実装 ✅
|
||||
- 200-B-3: パイプライン組み込み（Pattern 2）✅
|
||||
- 200-B-4: digits ケース検証 ✅
|
||||
- 200-B-5: ドキュメント更新 ✅
|
||||
- **成果**:
|
||||
- digits が CapturedEnv に捕捉される ✅
|
||||
- ConditionEnv.captured に登録される ✅
|
||||
- ParamRole::Condition として boundary に追加される ✅
|
||||
- **制約**:
|
||||
- digits.indexOf(ch) の E2E 動作は Phase 200-C
|
||||
- ComplexAddendNormalizer の MethodCall 対応が必要
|
||||
- **次フェーズ**: Phase 200-C（digits.indexOf E2E 連携）
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 成功基準
|
||||
|
||||
- [x] `analyze_captured_vars` が digits を正しく検出
|
||||
- [x] `build_with_captures` が ConditionEnv.captured に追加
|
||||
- [x] boundary に ParamRole::Condition として登録
|
||||
- [x] 既存テストが退行しない
|
||||
- [x] Unit tests (6+ 件) が PASS
|
||||
- [x] phase200_digits_*.hako で capture が確認できる
|
||||
|
||||
---
|
||||
|
||||
## 設計原則（Phase 200-B）
|
||||
|
||||
1. **スコープ限定**: digits 系の最小ケースのみ
|
||||
2. **Fail-Fast 維持**: 安全でないパターンは即座に拒否
|
||||
3. **段階適用**: Pattern 2 のみに適用、他パターンは影響なし
|
||||
4. **E2E 分離**: ConditionEnv への統合と、MethodCall 連携は別フェーズ
|
||||
|
||||
---
|
||||
|
||||
## 関連ファイル
|
||||
|
||||
### 修正対象
|
||||
- `src/mir/loop_pattern_detection/function_scope_capture.rs`
|
||||
- `src/mir/builder/control_flow/joinir/patterns/condition_env_builder.rs`
|
||||
- `src/mir/join_ir/lowering/inline_boundary_builder.rs`
|
||||
- `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`
|
||||
|
||||
### 新規作成
|
||||
- `apps/tests/phase200_digits_atoi_min.hako`
|
||||
- `apps/tests/phase200_digits_parse_number_min.hako`
|
||||
|
||||
### ドキュメント
|
||||
- `docs/development/current/main/joinir-architecture-overview.md`
|
||||
- `CURRENT_TASK.md`
|
||||
333
docs/development/current/main/phase200-C-digits-e2e.md
Normal file
333
docs/development/current/main/phase200-C-digits-e2e.md
Normal file
@ -0,0 +1,333 @@
|
||||
# Phase 200-C: digits.indexOf E2E 連携
|
||||
|
||||
**Date**: 2025-12-09
|
||||
**Status**: Ready for Implementation
|
||||
**Prerequisite**: Phase 200-A/B complete
|
||||
|
||||
---
|
||||
|
||||
## ゴール
|
||||
|
||||
1. **PatternPipelineContext / LoopPatternContext に fn_body（関数全体 AST）を通す**
|
||||
2. **Pattern 2 で FunctionScopeCaptureAnalyzer を実際に呼び出す**
|
||||
3. **digits.indexOf(ch) を含む最小ループを JoinIR 経由で最後まで動かす**
|
||||
|
||||
**成功基準**:
|
||||
- `phase200_digits_atoi_min.hako` が正しい結果（123）を出力
|
||||
- `phase200_digits_parse_number_min.hako` が正しい結果（"42"）を出力
|
||||
|
||||
---
|
||||
|
||||
## Task 200-C-1: LoopPatternContext に fn_body を追加
|
||||
|
||||
### 対象ファイル
|
||||
- `src/mir/builder/control_flow/joinir/patterns/router.rs`
|
||||
- `src/mir/builder/control_flow/joinir/routing.rs`
|
||||
|
||||
### 実装内容
|
||||
|
||||
#### 1. LoopPatternContext 拡張
|
||||
|
||||
```rust
|
||||
// router.rs
|
||||
pub struct LoopPatternContext<'a> {
|
||||
// 既存フィールド
|
||||
pub condition: &'a ASTNode,
|
||||
pub body: &'a [ASTNode],
|
||||
pub func_name: &'a str,
|
||||
pub debug: bool,
|
||||
pub has_continue: bool,
|
||||
pub has_break: bool,
|
||||
pub features: LoopFeatures,
|
||||
pub pattern_kind: LoopPatternKind,
|
||||
|
||||
// Phase 200-C: NEW - 関数全体の AST
|
||||
pub fn_body: Option<&'a [ASTNode]>,
|
||||
}
|
||||
|
||||
impl<'a> LoopPatternContext<'a> {
|
||||
pub fn new(
|
||||
condition: &'a ASTNode,
|
||||
body: &'a [ASTNode],
|
||||
func_name: &'a str,
|
||||
debug: bool,
|
||||
) -> Self {
|
||||
// 既存コード...
|
||||
Self {
|
||||
// ...
|
||||
fn_body: None, // Phase 200-C: Default to None
|
||||
}
|
||||
}
|
||||
|
||||
/// Phase 200-C: Create context with fn_body for capture analysis
|
||||
pub fn with_fn_body(
|
||||
condition: &'a ASTNode,
|
||||
body: &'a [ASTNode],
|
||||
func_name: &'a str,
|
||||
debug: bool,
|
||||
fn_body: &'a [ASTNode],
|
||||
) -> Self {
|
||||
let mut ctx = Self::new(condition, body, func_name, debug);
|
||||
ctx.fn_body = Some(fn_body);
|
||||
ctx
|
||||
}
|
||||
}
|
||||
```
|
||||
|
||||
#### 2. routing.rs から fn_body を渡す
|
||||
|
||||
```rust
|
||||
// routing.rs - cf_loop_joinir_impl()
|
||||
|
||||
pub(in crate::mir::builder) fn cf_loop_joinir_impl(
|
||||
&mut self,
|
||||
condition: &ASTNode,
|
||||
body: &[ASTNode],
|
||||
func_name: &str,
|
||||
debug: bool,
|
||||
) -> Result<Option<ValueId>, String> {
|
||||
use super::patterns::{route_loop_pattern, LoopPatternContext};
|
||||
|
||||
// Phase 200-C: Get fn_body from current_function if available
|
||||
let fn_body_opt = self.current_function.as_ref()
|
||||
.map(|f| f.body.as_slice());
|
||||
|
||||
let ctx = if let Some(fn_body) = fn_body_opt {
|
||||
LoopPatternContext::with_fn_body(condition, body, func_name, debug, fn_body)
|
||||
} else {
|
||||
LoopPatternContext::new(condition, body, func_name, debug)
|
||||
};
|
||||
|
||||
if let Some(result) = route_loop_pattern(self, &ctx)? {
|
||||
// ...
|
||||
}
|
||||
// ...
|
||||
}
|
||||
```
|
||||
|
||||
### 制約
|
||||
|
||||
- P1/P3/P4 は `fn_body` を使わなくても動く（`None` を無視）
|
||||
- `fn_body` が取得できない場合も動作する（空の CapturedEnv になる）
|
||||
|
||||
---
|
||||
|
||||
## Task 200-C-2: Pattern 2 で FunctionScopeCaptureAnalyzer を呼ぶ
|
||||
|
||||
### 対象ファイル
|
||||
- `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`
|
||||
|
||||
### 実装内容
|
||||
|
||||
Pattern 2 lowerer の `lower()` 関数内で capture 解析を呼び出す:
|
||||
|
||||
```rust
|
||||
// pattern2_with_break.rs
|
||||
|
||||
use crate::mir::loop_pattern_detection::function_scope_capture::{
|
||||
analyze_captured_vars, CapturedEnv
|
||||
};
|
||||
|
||||
pub fn lower(
|
||||
builder: &mut MirBuilder,
|
||||
ctx: &LoopPatternContext,
|
||||
) -> Result<Option<ValueId>, String> {
|
||||
// 既存のループスコープ分析...
|
||||
let scope = /* ... */;
|
||||
|
||||
// Phase 200-C: Capture analysis
|
||||
let captured_env = if let Some(fn_body) = ctx.fn_body {
|
||||
// fn_body が利用可能 - capture 解析を実行
|
||||
let loop_ast = /* ループ AST を構築 or ctx から取得 */;
|
||||
analyze_captured_vars(fn_body, &loop_ast, &scope)
|
||||
} else {
|
||||
// fn_body なし - 空の CapturedEnv
|
||||
CapturedEnv::new()
|
||||
};
|
||||
|
||||
// 既存の ConditionEnv 構築を v2 に置き換え
|
||||
let cond_env = build_with_captures(
|
||||
&loop_var_name,
|
||||
&captured_env,
|
||||
&builder.variable_map,
|
||||
loop_var_id,
|
||||
);
|
||||
|
||||
// 以降は既存のフロー...
|
||||
}
|
||||
```
|
||||
|
||||
### 注意点
|
||||
|
||||
1. **ループ AST の構築**: `analyze_captured_vars` は `loop_ast: &ASTNode` を必要とする
|
||||
- `ctx.condition` と `ctx.body` から Loop ノードを構築する必要がある
|
||||
- または `fn_body` 内でループ位置を見つける
|
||||
|
||||
2. **既存フローとの互換性**: `captured_env` が空の場合は既存の動作と同じ
|
||||
|
||||
---
|
||||
|
||||
## Task 200-C-3: ConditionEnvBuilder v2 の統合
|
||||
|
||||
### 対象
|
||||
Pattern 2 lowerer 内の ConditionEnv 構築箇所
|
||||
|
||||
### 実装内容
|
||||
|
||||
```rust
|
||||
// 既存コード (Phase 200-B まで)
|
||||
let cond_env = build_loop_param_only(&loop_var_name, &boundary)?;
|
||||
|
||||
// Phase 200-C: v2 に置き換え
|
||||
let cond_env = build_with_captures(
|
||||
&loop_var_name,
|
||||
&captured_env, // 200-C-2 で取得
|
||||
&builder.variable_map,
|
||||
loop_var_id,
|
||||
);
|
||||
```
|
||||
|
||||
### 不変条件
|
||||
|
||||
- `captured_env` が空の場合、既存の `build_loop_param_only` と同じ結果
|
||||
- `captured_env` に変数がある場合:
|
||||
- `ConditionEnv.captured` に追加される
|
||||
- `ParamRole::Condition` として boundary に登録される
|
||||
- Header PHI や ExitLine の対象にはならない
|
||||
|
||||
---
|
||||
|
||||
## Task 200-C-4: digits ループの E2E 検証
|
||||
|
||||
### テストファイル
|
||||
|
||||
- `apps/tests/phase200_digits_atoi_min.hako` (Phase 200-B で作成済み)
|
||||
- `apps/tests/phase200_digits_parse_number_min.hako` (Phase 200-B で作成済み)
|
||||
|
||||
### 検証手順
|
||||
|
||||
```bash
|
||||
# Step 1: 構造トレース - Pattern 2 がマッチすること確認
|
||||
NYASH_JOINIR_STRUCTURE_ONLY=1 ./target/release/hakorune \
|
||||
apps/tests/phase200_digits_atoi_min.hako 2>&1 | head -30
|
||||
|
||||
# 確認:
|
||||
# - Pattern2_WithBreak がマッチ
|
||||
# - [joinir/freeze] や UnsupportedPattern が出ていない
|
||||
|
||||
# Step 2: Capture debug - digits が捕捉されていること確認
|
||||
NYASH_CAPTURE_DEBUG=1 ./target/release/hakorune \
|
||||
apps/tests/phase200_digits_atoi_min.hako 2>&1 | grep -i "capture"
|
||||
|
||||
# 期待出力:
|
||||
# [capture] Found: digits (host_id=XX, is_immutable=true)
|
||||
|
||||
# Step 3: E2E 実行
|
||||
./target/release/hakorune apps/tests/phase200_digits_atoi_min.hako
|
||||
# 期待: 123
|
||||
|
||||
./target/release/hakorune apps/tests/phase200_digits_parse_number_min.hako
|
||||
# 期待: "42"
|
||||
```
|
||||
|
||||
### トラブルシューティング
|
||||
|
||||
異常があれば:
|
||||
|
||||
```bash
|
||||
# PHI トレース
|
||||
NYASH_TRACE_PHI=1 NYASH_TRACE_VARMAP=1 ./target/release/hakorune \
|
||||
apps/tests/phase200_digits_atoi_min.hako 2>&1 | tail -50
|
||||
|
||||
# 確認ポイント:
|
||||
# - digits が ConditionEnv.captured に入っているか
|
||||
# - digits の ValueId が未定義になっていないか
|
||||
```
|
||||
|
||||
### 期待される結果
|
||||
|
||||
| テスト | 期待値 | 確認内容 |
|
||||
|--------|--------|----------|
|
||||
| `phase200_digits_atoi_min.hako` | 123 | print(v) の出力 |
|
||||
| `phase200_digits_parse_number_min.hako` | "42" | print(num_str) の出力 |
|
||||
|
||||
---
|
||||
|
||||
## Task 200-C-5: ドキュメント更新
|
||||
|
||||
### 1. joinir-architecture-overview.md
|
||||
|
||||
**追記内容**:
|
||||
|
||||
```markdown
|
||||
### Phase 200-C: digits.indexOf E2E 連携 (完了)
|
||||
|
||||
- **LoopPatternContext 拡張**
|
||||
- `fn_body: Option<&[ASTNode]>` フィールド追加
|
||||
- `with_fn_body()` コンストラクタ追加
|
||||
- 関数全体の AST を Pattern 2 lowerer に渡す
|
||||
|
||||
- **Pattern 2 キャプチャ統合**
|
||||
- `analyze_captured_vars()` を Pattern 2 で呼び出し
|
||||
- `build_with_captures()` で ConditionEnv 構築
|
||||
- digits のような関数ローカルが JoinIR 経由で参照可能に
|
||||
|
||||
- **JsonParser 対応状況** (更新)
|
||||
| メソッド | Pattern | ConditionEnv | Status |
|
||||
|----------|---------|--------------|--------|
|
||||
| _parse_number | P2 | digits capture | ✅ JoinIR |
|
||||
| _atoi | P2 | digits capture | ✅ JoinIR |
|
||||
```
|
||||
|
||||
### 2. CURRENT_TASK.md
|
||||
|
||||
**追記内容**:
|
||||
|
||||
```markdown
|
||||
- [x] **Phase 200-C: digits.indexOf E2E 連携** ✅ (完了: 2025-12-09)
|
||||
- **目的**: 200-A/B インフラを実際に Pattern 2 経路に統合
|
||||
- **実装内容**:
|
||||
- 200-C-1: LoopPatternContext に fn_body 追加 ✅
|
||||
- 200-C-2: Pattern 2 で capture 解析呼び出し ✅
|
||||
- 200-C-3: ConditionEnvBuilder v2 統合 ✅
|
||||
- 200-C-4: digits E2E 検証 ✅
|
||||
- 200-C-5: ドキュメント更新 ✅
|
||||
- **成果**:
|
||||
- phase200_digits_atoi_min.hako → 123 ✅
|
||||
- phase200_digits_parse_number_min.hako → "42" ✅
|
||||
- **次フェーズ**: Phase 200-D（ComplexAddendNormalizer 拡張 - 必要なら）
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 成功基準
|
||||
|
||||
- [x] LoopPatternContext に fn_body が追加されている
|
||||
- [x] Pattern 2 で analyze_captured_vars() が呼ばれる
|
||||
- [x] digits が CapturedEnv に捕捉される
|
||||
- [x] ConditionEnv.captured に digits が存在する
|
||||
- [x] phase200_digits_atoi_min.hako → 123 出力
|
||||
- [x] phase200_digits_parse_number_min.hako → "42" 出力
|
||||
- [x] 既存テストに退行なし
|
||||
|
||||
---
|
||||
|
||||
## 関連ファイル
|
||||
|
||||
### 修正対象
|
||||
- `src/mir/builder/control_flow/joinir/patterns/router.rs`
|
||||
- `src/mir/builder/control_flow/joinir/routing.rs`
|
||||
- `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`
|
||||
|
||||
### ドキュメント
|
||||
- `docs/development/current/main/joinir-architecture-overview.md`
|
||||
- `CURRENT_TASK.md`
|
||||
|
||||
---
|
||||
|
||||
## 設計原則
|
||||
|
||||
1. **後方互換**: fn_body が取得できない場合も動作（空 CapturedEnv）
|
||||
2. **段階適用**: Pattern 2 のみに統合、他パターンは影響なし
|
||||
3. **Fail-Fast 維持**: 安全でないパターンは無視（エラーにしない）
|
||||
4. **最小変更**: 既存の routing/lowering フローを大幅に変えない
|
||||
@ -0,0 +1,265 @@
|
||||
# Phase 201: JoinValueSpace Design
|
||||
|
||||
## 1. Problem Statement
|
||||
|
||||
### 1.1 Root Cause (Phase 201-A Analysis)
|
||||
|
||||
Pattern 2 frontend と JoinIR lowering の間で ValueId 空間が分離されていないため、衝突が発生している。
|
||||
|
||||
```
|
||||
Pattern 2 Frontend: JoinIR Lowering:
|
||||
┌────────────────────────┐ ┌────────────────────────┐
|
||||
│ alloc_join_value() │ │ alloc_value() │
|
||||
│ → env['v'] = ValueId(7)│ │ → const 100 dst=ValueId(7)│
|
||||
└────────────────────────┘ └────────────────────────┘
|
||||
│ │
|
||||
└─────────── Collision! ──────┘
|
||||
│
|
||||
▼
|
||||
remapper → Both → ValueId(12)
|
||||
│
|
||||
▼
|
||||
PHI corruption: %12 = phi [...], %12 = const 100
|
||||
```
|
||||
|
||||
### 1.2 Affected Components
|
||||
|
||||
| Component | Current ValueId Source | Issue |
|
||||
|-----------|------------------------|-------|
|
||||
| ConditionEnv | `alloc_join_value()` | Param IDs may collide with local IDs |
|
||||
| CarrierInfo.join_id | `alloc_join_value()` | Same allocator as ConditionEnv |
|
||||
| CapturedEnv | `alloc_join_value()` | Same allocator |
|
||||
| Pattern lowerers | `alloc_value()` (starts from 0) | Collides with param IDs |
|
||||
| LoopHeaderPhiBuilder | Uses remapped IDs | PHI dst may be overwritten |
|
||||
|
||||
## 2. Solution: JoinValueSpace
|
||||
|
||||
### 2.1 Design Goals
|
||||
|
||||
1. **Single Source of Truth**: All JoinIR ValueId allocation goes through one box
|
||||
2. **Disjoint Regions**: Param IDs, Local IDs, and PHI dst never overlap
|
||||
3. **Contract Enforcement**: Debug-mode assertions catch violations
|
||||
4. **Backward Compatible**: Existing APIs continue to work
|
||||
|
||||
### 2.2 ValueId Space Layout
|
||||
|
||||
```
|
||||
JoinValueSpace Memory Layout:
|
||||
|
||||
0 100 1000 u32::MAX
|
||||
├──────────┼──────────┼──────────────────────────┤
|
||||
│ PHI │ Param │ Local │
|
||||
│ Reserved│ Region │ Region │
|
||||
└──────────┴──────────┴──────────────────────────┘
|
||||
|
||||
PHI Reserved (0-99):
|
||||
- Pre-reserved for LoopHeader PHI dst
|
||||
- reserve_phi(id) marks specific IDs
|
||||
|
||||
Param Region (100-999):
|
||||
- alloc_param() allocates here
|
||||
- Used by: ConditionEnv, CarrierInfo.join_id, CapturedEnv
|
||||
|
||||
Local Region (1000+):
|
||||
- alloc_local() allocates here
|
||||
- Used by: Pattern lowerers (Const, BinOp, etc.)
|
||||
```
|
||||
|
||||
### 2.3 API Design
|
||||
|
||||
```rust
|
||||
/// Single source of truth for JoinIR ValueId allocation
|
||||
pub struct JoinValueSpace {
|
||||
/// Next available param ID (starts at PARAM_BASE)
|
||||
next_param: u32,
|
||||
/// Next available local ID (starts at LOCAL_BASE)
|
||||
next_local: u32,
|
||||
/// Reserved PHI dst IDs (debug verification only)
|
||||
reserved_phi: HashSet<u32>,
|
||||
}
|
||||
|
||||
impl JoinValueSpace {
|
||||
/// Create a new JoinValueSpace with default regions
|
||||
pub fn new() -> Self;
|
||||
|
||||
/// Allocate a parameter ValueId (for ConditionEnv, CarrierInfo, etc.)
|
||||
/// Returns ValueId in Param Region (100-999)
|
||||
pub fn alloc_param(&mut self) -> ValueId;
|
||||
|
||||
/// Allocate a local ValueId (for Const, BinOp, etc. in lowerers)
|
||||
/// Returns ValueId in Local Region (1000+)
|
||||
pub fn alloc_local(&mut self) -> ValueId;
|
||||
|
||||
/// Reserve a PHI dst ValueId (called by PHI builder before allocation)
|
||||
/// No allocation - just marks the ID as reserved for PHI use
|
||||
pub fn reserve_phi(&mut self, id: ValueId);
|
||||
|
||||
/// Check if a ValueId is in a specific region (debug use)
|
||||
pub fn region_of(&self, id: ValueId) -> Region;
|
||||
|
||||
/// Verify no overlap between regions (debug assertion)
|
||||
#[cfg(debug_assertions)]
|
||||
pub fn verify_no_overlap(&self) -> Result<(), String>;
|
||||
}
|
||||
|
||||
pub enum Region {
|
||||
PhiReserved,
|
||||
Param,
|
||||
Local,
|
||||
Unknown,
|
||||
}
|
||||
```
|
||||
|
||||
### 2.4 Constants
|
||||
|
||||
```rust
|
||||
// Region boundaries (can be tuned based on actual usage)
|
||||
const PHI_MAX: u32 = 99; // PHI dst range: 0-99
|
||||
const PARAM_BASE: u32 = 100; // Param range: 100-999
|
||||
const LOCAL_BASE: u32 = 1000; // Local range: 1000+
|
||||
```
|
||||
|
||||
## 3. Integration Points
|
||||
|
||||
### 3.1 ConditionEnv / CapturedEnv
|
||||
|
||||
```rust
|
||||
// Before (collision-prone):
|
||||
let mut env = ConditionEnv::new();
|
||||
let join_id = alloc_join_value(); // Could be 0, 1, 2...
|
||||
env.insert("i".to_string(), join_id);
|
||||
|
||||
// After (JoinValueSpace-based):
|
||||
let mut space = JoinValueSpace::new();
|
||||
let mut env = ConditionEnv::new();
|
||||
let join_id = space.alloc_param(); // Always 100+
|
||||
env.insert("i".to_string(), join_id);
|
||||
```
|
||||
|
||||
### 3.2 CarrierInfo.join_id
|
||||
|
||||
```rust
|
||||
// Before:
|
||||
carrier.join_id = Some(alloc_join_value()); // Could collide
|
||||
|
||||
// After:
|
||||
carrier.join_id = Some(space.alloc_param()); // Safe in Param region
|
||||
```
|
||||
|
||||
### 3.3 Pattern Lowerers
|
||||
|
||||
```rust
|
||||
// Before (loop_with_break_minimal.rs):
|
||||
let mut value_counter = 0u32;
|
||||
let mut alloc_value = || {
|
||||
let id = ValueId(value_counter);
|
||||
value_counter += 1;
|
||||
id
|
||||
}; // Starts from 0 - collides with env!
|
||||
|
||||
// After:
|
||||
let mut alloc_value = || space.alloc_local(); // Starts from 1000
|
||||
```
|
||||
|
||||
### 3.4 LoopHeaderPhiBuilder
|
||||
|
||||
```rust
|
||||
// Before merge:
|
||||
space.reserve_phi(phi_dst); // Mark PHI dst as reserved
|
||||
|
||||
// After finalization:
|
||||
// verify_no_overlap() checks no local overwrote PHI dst
|
||||
```
|
||||
|
||||
## 4. Migration Plan
|
||||
|
||||
### Phase 201-2: JoinValueSpace Box
|
||||
|
||||
1. Create `join_value_space.rs` in `src/mir/join_ir/lowering/`
|
||||
2. Implement struct and core methods
|
||||
3. Add unit tests for region separation
|
||||
4. No integration yet - box only
|
||||
|
||||
### Phase 201-3: Param Region Migration
|
||||
|
||||
1. Modify `pattern2_with_break.rs` to pass JoinValueSpace
|
||||
2. Update ConditionEnvBuilder to use `alloc_param()`
|
||||
3. Update CarrierInfo initialization to use `alloc_param()`
|
||||
4. Verify: Param IDs are now 100+
|
||||
|
||||
### Phase 201-4: PHI Reservation
|
||||
|
||||
1. Modify LoopHeaderPhiBuilder to call `reserve_phi()`
|
||||
2. Add verification in merge/mod.rs
|
||||
3. Verify: PHI dst is protected from overwrite
|
||||
|
||||
### Phase 201-5: Local Region Migration
|
||||
|
||||
1. Modify all pattern lowerers to use `alloc_local()`
|
||||
2. Files: `loop_with_break_minimal.rs`, `loop_with_continue_minimal.rs`, etc.
|
||||
3. Verify: Local IDs are now 1000+
|
||||
|
||||
### Phase 201-6: Testing
|
||||
|
||||
1. Run all existing tests (no regression)
|
||||
2. Add `phase201_valueid_collision.hako` test
|
||||
3. Verify `phase200d_capture_minimal.hako` outputs 30 (not 110)
|
||||
|
||||
## 5. Design Decisions
|
||||
|
||||
### 5.1 Why Fixed Regions?
|
||||
|
||||
Alternative: Dynamic start offset based on env.max_value_id()
|
||||
- Pro: No wasted ID space
|
||||
- Con: Complex, error-prone, requires coordination
|
||||
|
||||
Fixed regions are simpler:
|
||||
- Clear boundaries (100, 1000)
|
||||
- Easy to debug (看ID值就知道是Param还是Local)
|
||||
- No coordination needed between allocators
|
||||
|
||||
### 5.2 Why reserve_phi() Instead of alloc_phi()?
|
||||
|
||||
PHI dst IDs come from MirBuilder (host side), not JoinValueSpace.
|
||||
JoinValueSpace only needs to know "don't overwrite these IDs".
|
||||
Hence `reserve_phi()` is a marker, not an allocator.
|
||||
|
||||
### 5.3 Relation to value_id_ranges.rs
|
||||
|
||||
`value_id_ranges.rs` is for **module-level isolation** (min_loop, skip_ws, etc.)
|
||||
Each module gets a large fixed range (2000 IDs).
|
||||
|
||||
`JoinValueSpace` is for **intra-lowering isolation** (param vs local vs PHI).
|
||||
It operates within a single lowering call.
|
||||
|
||||
They are complementary:
|
||||
- Module-level: value_id_ranges.rs
|
||||
- Intra-lowering: JoinValueSpace
|
||||
|
||||
## 6. Success Criteria
|
||||
|
||||
1. `phase200d_capture_minimal.hako` outputs **30** (not 110)
|
||||
2. All existing tests pass (no regression)
|
||||
3. Debug build asserts on ValueId collision
|
||||
4. Architecture doc updated with JoinValueSpace section
|
||||
|
||||
## 7. File Changes Summary
|
||||
|
||||
| File | Change |
|
||||
|------|--------|
|
||||
| `join_value_space.rs` (NEW) | JoinValueSpace struct + methods |
|
||||
| `condition_env.rs` | No change (env is storage, not allocator) |
|
||||
| `condition_env_builder.rs` | Use JoinValueSpace.alloc_param() |
|
||||
| `carrier_info.rs` | No change (storage only) |
|
||||
| `pattern2_with_break.rs` | Pass JoinValueSpace, use alloc_param() |
|
||||
| `loop_with_break_minimal.rs` | Use JoinValueSpace.alloc_local() |
|
||||
| `loop_with_continue_minimal.rs` | Use JoinValueSpace.alloc_local() |
|
||||
| `loop_with_if_phi_minimal.rs` | Use JoinValueSpace.alloc_local() |
|
||||
| `loop_header_phi_builder.rs` | Call reserve_phi() |
|
||||
| `merge/mod.rs` | Create JoinValueSpace, pass down |
|
||||
|
||||
## 8. References
|
||||
|
||||
- Phase 201-A analysis: carrier PHI dst overwrite bug
|
||||
- joinir-architecture-overview.md: JoinIR invariants
|
||||
- value_id_ranges.rs: Module-level ValueId isolation
|
||||
Reference in New Issue
Block a user