docs: Phase 133 P1 - Mark as Done (Trim promoted_pairs SSOT fix complete)

This commit is contained in:
nyash-codex
2025-12-15 13:03:44 +09:00
parent 439633020b
commit f5c1694d44

View File

@ -1,8 +1,8 @@
# Phase 133: Promoted Carrier Join ID (Loop Condition Promotion) # Phase 133: Promoted Carrier Join ID (Loop Condition Promotion)
**Date**: 2025-12-15 **Date**: 2025-12-15
**Status**: ⏳ Planning (P0 fixture/smoke ready, awaiting fix) **Status**: ✅ Done (P1 fix complete)
**Scope**: Loop内のcondition promotionにおいて、promoted carrierにjoin_idが割り当てられていない問題を解決 **Scope**: Loop内のcondition promotionにおいて、Trim promoted carrierにjoin_idが割り当てられていない問題を解決
--- ---
@ -22,23 +22,31 @@ loop(index < s.length()) {
} }
``` ```
**エラー**: `[phase229] promoted carrier 'is_char_match' has no join_id` **エラー(修正前)**: `[phase229] promoted carrier 'is_char_match' has no join_id`
--- ---
## 根本原因 ## 根本原因
- [cond_promoter] がループ内の条件式 `char == " "``promoted carrier` に昇格 - Trim系のcondition promotion (A-3) が返す `CarrierInfo` は promoted carrier を `carriers` に入れず `loop_var_name` 側に置く設計
- break時のexitブロックでこのcarrierの値をどうするかjoin_idが未定義 - Pattern2 が `find_carrier()` で join_id を取ろうとして `[phase229] ... has no join_id` で落ちる
- Phase 229Promoted Carrier Join ID割り当てで panic - 該当: `src/mir/loop_pattern_detection/loop_body_carrier_promoter.rs:73` (コメント通り "carriers: Empty")
--- ---
## 修正対象 ## 修正内容P1: 箱理論アプローチ)
**Phase 229**: Promoted Carrier Join ID割り当ての拡張 **方針**: Pattern2 は Trim(A-3) を自前で join_id 解決しない。Trim は既に `apply_trim_and_normalize()` (= TrimLoopLowerer) が SSOT で ConditionEnv に join_id を登録するので、そちらに責務を寄せて二重実装を消す。
- Loop exit時に promoted carrier が安全に処理される
- Exit PHI と promoted carrier の生命周期統合 **実装**: `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`
- `promote_and_prepare_carriers()` で Promoted が Trim 由来かチェック (`carrier_info.trim_helper().is_some()`)
- Trim の場合:
- `promoted_pairs.push()` をスキップ
- `DigitPosConditionNormalizer::normalize()` をスキップ
- `[phase229]` の promoted_pairs 解決ループ自体を通らない
- Trim でないDigitPos等なら、現状の promoted_pairs + join_id 解決を維持
**結果**: "Trim を cond_promoter 側で promote したのに、Pattern2 側で join_id を要求して死ぬ" 構造矛盾が解消
--- ---
@ -47,15 +55,17 @@ loop(index < s.length()) {
### P0: Fixture & Smoke Test 実装 ### P0: Fixture & Smoke Test 実装
- ✅ Fixture: `apps/tests/phase133_json_skip_whitespace_min.hako` - ✅ Fixture: `apps/tests/phase133_json_skip_whitespace_min.hako`
- ✅ Smoke: `tools/smokes/v2/profiles/integration/apps/phase133_json_skip_whitespace_llvm_exe.sh` - ✅ Smoke: `tools/smokes/v2/profiles/integration/apps/phase133_json_skip_whitespace_llvm_exe.sh`
- VM: promoted carrier join_id エラーを検出Phase 133 修正前の状態) - P0: promoted carrier join_id エラーを検出Phase 133 修正前の状態)
- LLVM EXE: build時に同じエラーを検出 - P1: MIR compilation 成功promoted carrier join_id エラー消滅)
**Acceptance Criteria (P0)**: ### P1: 修正完了
- bash tools/smokes/v2/profiles/integration/apps/phase133_json_skip_whitespace_llvm_exe.sh が 2/2 PASS - ✅ MIR compilation: promoted carrier join_id エラーが消滅
- Phase 132 smoke test退行チェック)も PASS - Phase 132 退行チェック: 3/3 PASS
- ⚠️ Note: Fixture の VM 実行エラーsubstring on IntegerBoxは別問題として Phase 134+ で対応
### P1: _unescape_string 追加 **Acceptance Criteria (P1)**:
同じJsonParser由来の別ループcontinue + 可変ステップで、promoted carrierパターンを追加検証 - `--dump-mir``[phase229] ... has no join_id` エラーが出ないこと ✅
- Phase 132 smoke test退行チェック: 3/3 PASS ✅
--- ---
@ -63,4 +73,5 @@ loop(index < s.length()) {
- **Fixture**: `apps/tests/phase133_json_skip_whitespace_min.hako` - **Fixture**: `apps/tests/phase133_json_skip_whitespace_min.hako`
- **Smoke Test**: `tools/smokes/v2/profiles/integration/apps/phase133_json_skip_whitespace_llvm_exe.sh` - **Smoke Test**: `tools/smokes/v2/profiles/integration/apps/phase133_json_skip_whitespace_llvm_exe.sh`
- **Phase 132**: Exit PHI value parity (Phase 133は promoted carrierの寿命管理を扱う) - **Phase 132**: Exit PHI value parity (Phase 133は promoted carrierの join_id SSOT統一を扱う)
- **修正コミット**: `b3c832b2` fix(joinir): Phase 133 P1 - Skip Trim promoted_pairs resolution