Files
hakorune/docs/development/current/main/phases/phase-286/README.md

149 lines
8.5 KiB
Markdown
Raw Normal View History

feat(phase284): P1 Complete - Return in Loop with Block Remap Fix ## Summary Completed Phase 284 P1: Enable return statements in Pattern4/5 loops via JoinInst::Ret infrastructure (100% pre-existing, no new infrastructure needed). **Critical Bug Fix**: Block ID remap priority - Fixed: local_block_map must take precedence over skipped_entry_redirects - Root cause: Function-local block IDs can collide with global remap entries (example: loop_step:bb4 vs k_exit:bb4 after merge allocation) - Impact: Conditional Jump else branches were incorrectly redirected to exit - Solution: Check local_block_map FIRST, then skipped_entry_redirects ## Implementation ### New Files - `src/mir/join_ir/lowering/return_collector.rs` - Return detection SSOT (top-level only, P1 scope) - `apps/tests/phase284_p1_return_in_loop_min.hako` - Test fixture (exit code 7) - Smoke test scripts (VM/LLVM) ### Modified Files - `loop_with_continue_minimal.rs`: Return condition check + Jump generation - `pattern4_with_continue.rs`: K_RETURN registration in continuation_funcs - `canonical_names.rs`: K_RETURN constant - `instruction_rewriter.rs`: Fixed Branch remap priority (P1 fix) - `terminator.rs`: Fixed Jump/Branch remap priority (P1 fix) - `conversion_pipeline.rs`: Return normalization support ## Testing ✅ VM: exit=7 PASS ✅ LLVM: exit=7 PASS ✅ Baseline: 46 PASS, 1 FAIL (pre-existing emit issue) ✅ Zero regression ## Design Notes - JoinInst::Ret infrastructure was 100% complete before P1 - Bridge automatically converts JoinInst::Ret → MIR Return terminator - Pattern4/5 now properly merge k_return as non-skippable continuation - Correct semantics: true condition → return, false → continue loop ## Next Phase (P2+) - Refactor: Block remap SSOT (block_remapper.rs) - Refactor: Return jump emitter extraction - Scope: Nested if/loop returns, multiple returns - Design: Standardize early exit pattern (return/break/continue as Jump with cond) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-23 14:21:27 +09:00
# Phase 286: JoinIR Line AbsorptionJoinIR→CorePlan/Frag 収束)
Status: In Progress (P0, P1, P3, 286C-2 COMPLETE; P2 pending)
feat(phase284): P1 Complete - Return in Loop with Block Remap Fix ## Summary Completed Phase 284 P1: Enable return statements in Pattern4/5 loops via JoinInst::Ret infrastructure (100% pre-existing, no new infrastructure needed). **Critical Bug Fix**: Block ID remap priority - Fixed: local_block_map must take precedence over skipped_entry_redirects - Root cause: Function-local block IDs can collide with global remap entries (example: loop_step:bb4 vs k_exit:bb4 after merge allocation) - Impact: Conditional Jump else branches were incorrectly redirected to exit - Solution: Check local_block_map FIRST, then skipped_entry_redirects ## Implementation ### New Files - `src/mir/join_ir/lowering/return_collector.rs` - Return detection SSOT (top-level only, P1 scope) - `apps/tests/phase284_p1_return_in_loop_min.hako` - Test fixture (exit code 7) - Smoke test scripts (VM/LLVM) ### Modified Files - `loop_with_continue_minimal.rs`: Return condition check + Jump generation - `pattern4_with_continue.rs`: K_RETURN registration in continuation_funcs - `canonical_names.rs`: K_RETURN constant - `instruction_rewriter.rs`: Fixed Branch remap priority (P1 fix) - `terminator.rs`: Fixed Jump/Branch remap priority (P1 fix) - `conversion_pipeline.rs`: Return normalization support ## Testing ✅ VM: exit=7 PASS ✅ LLVM: exit=7 PASS ✅ Baseline: 46 PASS, 1 FAIL (pre-existing emit issue) ✅ Zero regression ## Design Notes - JoinInst::Ret infrastructure was 100% complete before P1 - Bridge automatically converts JoinInst::Ret → MIR Return terminator - Pattern4/5 now properly merge k_return as non-skippable continuation - Correct semantics: true condition → return, false → continue loop ## Next Phase (P2+) - Refactor: Block remap SSOT (block_remapper.rs) - Refactor: Return jump emitter extraction - Scope: Nested if/loop returns, multiple returns - Design: Standardize early exit pattern (return/break/continue as Jump with cond) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-23 14:21:27 +09:00
## Goal
移行期間に残っている「2本の lowering」を、構造で 1 本に収束させる。
- Plan linePattern6/7: `CorePlan → Frag(compose) → emit_frag()` が SSOT
- JoinIR linePattern15,9: `JoinIR → bridge → merge` が SSOT
Phase 286 では JoinIR line を “第2の lowerer” として放置せず、**Plan/Frag SSOT へ吸収**する道筋を固定する。
## Whyなぜ今
- `return` のような「大きな出口語彙」は、責務が分散すると実装場所が揺れて事故りやすい
- 移行期間の弱点は「同じASTでも経路により意味論が割れる可能性がある」こと
- pattern を溶かしていく思想の最後の壁が “JoinIR line の残存” になりやすい
## SSOTPhase 286 で守る憲法)
- **SSOT=extract**Phase 282: 検出は extract の成功でのみ決める。`pattern_kind` は O(1) safety valve のみ。
- **CFG/terminator SSOT**Phase 280/281: `Frag + compose::* + emit_frag()` が唯一の terminator 生成点。
- **Fail-Fast**: close-but-unsupported を `Ok(None)` で黙殺しないsilent reroute 禁止)。
## Responsibility Mapどこを触るか
- JoinIR line の共通入口(現状):
- `src/mir/builder/control_flow/joinir/patterns/conversion_pipeline.rs`
- `src/mir/join_ir_vm_bridge/bridge.rs`
- `src/mir/builder/control_flow/joinir/merge/mod.rs`
- Plan/Frag SSOT収束先:
- `src/mir/builder/control_flow/plan/*`
- `src/mir/builder/control_flow/edgecfg/api/compose.rs`
- `src/mir/builder/control_flow/edgecfg/api/emit.rs`
## Scope提案
### P0docs-only✅ COMPLETE (2025-12-25)
**完了内容**:
- **SSOT ドキュメント作成**: `docs/development/current/main/design/joinir-plan-frag-ssot.md` を作成
- **8章構成で固定**:
1. Scope / Non-goals - 対象範囲の明確化
2. 用語Terms - JoinIR line, Plan, Frag, Boundary, ExitKind, Freeze point, SSOT の定義
3. 責務Responsibilities - Planが決めること・決めないこと / Fragが保持すること・保持しないこと
4. 禁止事項Prohibitions - Planでの実行・名前解決・最適化・ルール実装の禁止 等
5. 凍結点Freeze Points - PlanFreeze / BoundaryFreeze / ValueIdAllocate / MergeComplete
6. 不変条件Invariants / Fail-Fast - Plan段階(V1-V7) / Boundary段階(B1-B2, C1-C2) / Merge段階(M1-M4)
7. 2本コンパイラ根治の合流点 - 共通パス・分岐点・差分許容場所/非許容場所
8. デバッグ導線 - NYASH_CLI_VERBOSE, HAKO_JOINIR_DEBUG, NYASH_TRACE_VARMAP 等
**重要な設計決定**:
- JoinIR line を AST → MIR 全体ではなく、「(Pattern detection/Plan) → (Frag+Boundary) → (MIR merge) の限定されたパイプライン」として定義
- 禁止事項の「例外なし」表現を削除し、「診断専用の扱いdebugタグ付き・既定OFF」という運用ルールに変更
- ValueId 100-999 固定範囲を「host ValueId と衝突しない領域」という原則に変更(具体数値は実装詳細として注記)
**成果物**:
- `docs/development/current/main/design/joinir-plan-frag-ssot.md` (新規)
- コード変更なしdocs-only
### P1 (contract_checks 導入 + 実バグ修正) ✅ COMPLETE (2025-12-25)
**完了内容**:
- **contract_checks.rs に検証関数追加**: `verify_boundary_contract_at_creation()`
- B1検証: join_inputs が Param 領域にあること
- C2検証: condition_bindings が Param 領域にあること
- **merge/mod.rs に検証呼び出し追加**: merge開始時にFail-Fast検証
- **実バグ3件修正**: Pattern2/4/5 で `alloc_local()` を誤って使っていた箇所を `alloc_param()` に修正
**成果物**:
- `src/mir/builder/control_flow/joinir/merge/contract_checks.rs` (変更)
- `src/mir/builder/control_flow/joinir/merge/mod.rs` (変更)
- `src/mir/join_ir/lowering/loop_with_break_minimal.rs` (変更)
- `src/mir/join_ir/lowering/loop_with_continue_minimal.rs` (変更)
- `src/mir/builder/control_flow/joinir/patterns/pattern5_infinite_early_exit.rs` (変更)
**発見された問題**:
- 各 pattern の lowering で関数パラメータに `alloc_local()` を使っていた(本来は `alloc_param()`
- これにより join_inputs に Local ValueId (1000+) が混入し、検証エラーになっていた
**改善の示唆Post-P1 Polish 実施済み)**:
- API名の曖昧さが誤用を招いていたため、`alloc_join_param()` / `alloc_join_local()` の導入が検討されている
- エラーメッセージの「原因特定」強化として context パラメータの追加が検討されている
**Post-P1 Polish 追加** (2025-12-25):
- **新API追加**: `JoinValueSpace::alloc_join_param()` / `alloc_join_local()` (薄いラッパー)
- **エラーメッセージ改善**: `verify_boundary_contract_at_creation()``context: &str` パラメータ追加
- **docs反映**: SSOTドキュメントに脚注形式で数値記載、新API使用の明記
feat(phase284): P1 Complete - Return in Loop with Block Remap Fix ## Summary Completed Phase 284 P1: Enable return statements in Pattern4/5 loops via JoinInst::Ret infrastructure (100% pre-existing, no new infrastructure needed). **Critical Bug Fix**: Block ID remap priority - Fixed: local_block_map must take precedence over skipped_entry_redirects - Root cause: Function-local block IDs can collide with global remap entries (example: loop_step:bb4 vs k_exit:bb4 after merge allocation) - Impact: Conditional Jump else branches were incorrectly redirected to exit - Solution: Check local_block_map FIRST, then skipped_entry_redirects ## Implementation ### New Files - `src/mir/join_ir/lowering/return_collector.rs` - Return detection SSOT (top-level only, P1 scope) - `apps/tests/phase284_p1_return_in_loop_min.hako` - Test fixture (exit code 7) - Smoke test scripts (VM/LLVM) ### Modified Files - `loop_with_continue_minimal.rs`: Return condition check + Jump generation - `pattern4_with_continue.rs`: K_RETURN registration in continuation_funcs - `canonical_names.rs`: K_RETURN constant - `instruction_rewriter.rs`: Fixed Branch remap priority (P1 fix) - `terminator.rs`: Fixed Jump/Branch remap priority (P1 fix) - `conversion_pipeline.rs`: Return normalization support ## Testing ✅ VM: exit=7 PASS ✅ LLVM: exit=7 PASS ✅ Baseline: 46 PASS, 1 FAIL (pre-existing emit issue) ✅ Zero regression ## Design Notes - JoinInst::Ret infrastructure was 100% complete before P1 - Bridge automatically converts JoinInst::Ret → MIR Return terminator - Pattern4/5 now properly merge k_return as non-skippable continuation - Correct semantics: true condition → return, false → continue loop ## Next Phase (P2+) - Refactor: Block remap SSOT (block_remapper.rs) - Refactor: Return jump emitter extraction - Scope: Nested if/loop returns, multiple returns - Design: Standardize early exit pattern (return/break/continue as Jump with cond) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-23 14:21:27 +09:00
### P2PoC
- 代表 1 パターン(例: Pattern4を "JoinIR 生成 → CorePlan/Frag" に変換する PoC
feat(phase284): P1 Complete - Return in Loop with Block Remap Fix ## Summary Completed Phase 284 P1: Enable return statements in Pattern4/5 loops via JoinInst::Ret infrastructure (100% pre-existing, no new infrastructure needed). **Critical Bug Fix**: Block ID remap priority - Fixed: local_block_map must take precedence over skipped_entry_redirects - Root cause: Function-local block IDs can collide with global remap entries (example: loop_step:bb4 vs k_exit:bb4 after merge allocation) - Impact: Conditional Jump else branches were incorrectly redirected to exit - Solution: Check local_block_map FIRST, then skipped_entry_redirects ## Implementation ### New Files - `src/mir/join_ir/lowering/return_collector.rs` - Return detection SSOT (top-level only, P1 scope) - `apps/tests/phase284_p1_return_in_loop_min.hako` - Test fixture (exit code 7) - Smoke test scripts (VM/LLVM) ### Modified Files - `loop_with_continue_minimal.rs`: Return condition check + Jump generation - `pattern4_with_continue.rs`: K_RETURN registration in continuation_funcs - `canonical_names.rs`: K_RETURN constant - `instruction_rewriter.rs`: Fixed Branch remap priority (P1 fix) - `terminator.rs`: Fixed Jump/Branch remap priority (P1 fix) - `conversion_pipeline.rs`: Return normalization support ## Testing ✅ VM: exit=7 PASS ✅ LLVM: exit=7 PASS ✅ Baseline: 46 PASS, 1 FAIL (pre-existing emit issue) ✅ Zero regression ## Design Notes - JoinInst::Ret infrastructure was 100% complete before P1 - Bridge automatically converts JoinInst::Ret → MIR Return terminator - Pattern4/5 now properly merge k_return as non-skippable continuation - Correct semantics: true condition → return, false → continue loop ## Next Phase (P2+) - Refactor: Block remap SSOT (block_remapper.rs) - Refactor: Return jump emitter extraction - Scope: Nested if/loop returns, multiple returns - Design: Standardize early exit pattern (return/break/continue as Jump with cond) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-23 14:21:27 +09:00
- 目的: merge を通さずに `emit_frag()` 経由で終端が生成できることの証明
### P3 (error context enrichment) ✅ COMPLETE (2025-12-25)
**完了内容**:
- **P2**: host_fn をエラーコンテキストに追加(関数名での特定を容易に)
- **P3**: join-side 情報continuation数・boundaryサマリをエラーコンテキストに追加
- `[conts=X exits=Y conds=Z]` 形式のサマリを追加
- 固定キー名で解析容易に
**成果物**:
- `src/mir/builder/control_flow/joinir/merge/mod.rs` (変更)
- 最終エラーフォーマット: `[merge_joinir_mir_blocks host=X join=Y [conts=A exits=B conds=C]]`
### 286C-2 (instruction_rewriter.rs 箱化) ✅ COMPLETE (2025-12-25)
**完了内容**:
- **instruction_rewriter.rs の箱化・意味論不変**: 1400行ファイルに責務リストコメントを追加し、4つの箱モジュールを抽出
- **InstructionFilterBox**: Skip判定ロジック純粋関数
- `should_skip_copy_overwriting_phi()` - CopyがPHI dstを上書きするか判定
- `should_skip_function_name_const()` - Const String関数名のスキップ判定
- `should_skip_boundary_input_const()` - Boundary input Constのスキップ判定
- **ReturnConverterBox**: Return→Jump変換ヘルパー
- `should_keep_return()` - 非スキップ可能継続のReturn保持判定
- `remap_return_value()` - Return値のremapヘルパー
- **TailCallDetectorBox**: テイルコール検出ヘルパー
- `is_recursive_call()` - 再帰呼び出し判定
- `is_loop_entry_call()` - ループエントリ呼び出し判定
- `should_skip_param_binding()` - パラメータ束縛スキップ判定
- `call_type_description()` - 呼び出しタイプの説明文字列取得
- **ParameterBindingBox**: パラメータ束縛ヘルパー
- `should_skip_phi_param()` - PHI dstパラメータのスキップ判定
- `carrier_param_count()` - キャリアパラメータ数取得
- `has_more_carrier_args()` - キャリア引数残確認
- `carrier_arg_index()` - キャリア引数インデックス計算
**成果物**:
- `src/mir/builder/control_flow/joinir/merge/rewriter/instruction_filter_box.rs` (新規)
- `src/mir/builder/control_flow/joinir/merge/rewriter/return_converter_box.rs` (新規)
- `src/mir/builder/control_flow/joinir/merge/rewriter/tail_call_detector_box.rs` (新規)
- `src/mir/builder/control_flow/joinir/merge/rewriter/parameter_binding_box.rs` (新規)
- `src/mir/builder/control_flow/joinir/merge/instruction_rewriter.rs` (変更: 責務リストコメント追加 + 箱使用)
- `src/mir/builder/control_flow/joinir/merge/rewriter/mod.rs` (変更: モジュール追加)
**注意点**:
- 意味論は完全不変既存のinlineロジックを箱関数呼び出しに置換
- ファイル行数は1454行に増加コメント・import追加により
- 核ロジックは main loop に密結合しているため、完全な分離にはさらなるリファクタリングが必要
- スモークテスト: 既存FAILなし1件のemit失敗は本変更と無関係
feat(phase284): P1 Complete - Return in Loop with Block Remap Fix ## Summary Completed Phase 284 P1: Enable return statements in Pattern4/5 loops via JoinInst::Ret infrastructure (100% pre-existing, no new infrastructure needed). **Critical Bug Fix**: Block ID remap priority - Fixed: local_block_map must take precedence over skipped_entry_redirects - Root cause: Function-local block IDs can collide with global remap entries (example: loop_step:bb4 vs k_exit:bb4 after merge allocation) - Impact: Conditional Jump else branches were incorrectly redirected to exit - Solution: Check local_block_map FIRST, then skipped_entry_redirects ## Implementation ### New Files - `src/mir/join_ir/lowering/return_collector.rs` - Return detection SSOT (top-level only, P1 scope) - `apps/tests/phase284_p1_return_in_loop_min.hako` - Test fixture (exit code 7) - Smoke test scripts (VM/LLVM) ### Modified Files - `loop_with_continue_minimal.rs`: Return condition check + Jump generation - `pattern4_with_continue.rs`: K_RETURN registration in continuation_funcs - `canonical_names.rs`: K_RETURN constant - `instruction_rewriter.rs`: Fixed Branch remap priority (P1 fix) - `terminator.rs`: Fixed Jump/Branch remap priority (P1 fix) - `conversion_pipeline.rs`: Return normalization support ## Testing ✅ VM: exit=7 PASS ✅ LLVM: exit=7 PASS ✅ Baseline: 46 PASS, 1 FAIL (pre-existing emit issue) ✅ Zero regression ## Design Notes - JoinInst::Ret infrastructure was 100% complete before P1 - Bridge automatically converts JoinInst::Ret → MIR Return terminator - Pattern4/5 now properly merge k_return as non-skippable continuation - Correct semantics: true condition → return, false → continue loop ## Next Phase (P2+) - Refactor: Block remap SSOT (block_remapper.rs) - Refactor: Return jump emitter extraction - Scope: Nested if/loop returns, multiple returns - Design: Standardize early exit pattern (return/break/continue as Jump with cond) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Haiku 4.5 <noreply@anthropic.com>
2025-12-23 14:21:27 +09:00
## AcceptanceP0
- 2本の lowering が “設計として” どこで 1 本に収束するかが明文化されている
- Phase 284Return/ Phase 285GCと矛盾しない