feat(joinir): Phase 176 Pattern2 multi-carrier lowering complete
Task 176-1: Pattern2 limitation investigation - Identified 10 limitation points where only position carrier was handled - Added TODO markers for Phase 176-2/3 implementation - Created phase176-pattern2-limitations.md documentation Task 176-2: CarrierUpdateLowerer helper implementation - Implemented emit_carrier_update() helper function - Supports CounterLike and AccumulationLike UpdateExpr patterns - Added 6 unit tests (all passing) - Fail-Fast error handling for carrier/variable not found Task 176-3: Pattern2 lowerer multi-carrier extension - Extended header PHI generation for all carriers - Implemented loop update for all carriers using emit_carrier_update() - Extended ExitLine/ExitMeta construction for all carriers - Updated function call/jump args to include all carriers - 9/10 tests passing (1 pre-existing test issue) Task 176-4: E2E testing and bug fixes - Fixed Trim pattern loop_var_name overwrite bug (pattern2_with_break.rs) - Fixed InstructionRewriter latch_incoming mapping bug - All E2E tests passing (RC=0): pos + result dual-carrier loops work - test_jsonparser_parse_string_min2.hako verified Task 176-5: Documentation updates - Created phase176-completion-report.md - Updated phase175-multicarrier-design.md with completion status - Updated joinir-architecture-overview.md roadmap - Updated CURRENT_TASK.md with Phase 176 completion + Phase 177 TODO - Updated loop_pattern_space.md F-axis (multi-carrier support complete) Technical achievements: - Pattern2 now handles single/multiple carriers uniformly - CarrierInfo architecture proven to work end-to-end - Two critical bugs fixed (loop_var overwrite, latch_incoming mapping) - No regressions in existing tests Next: Phase 177 - Apply to JsonParser _parse_string full implementation
This commit is contained in:
nyash-codex
@ -258,3 +258,53 @@ JoinIR は Rust 側だけでなく、将来的に .hako selfhost コンパイラ
|
||||
- JoinIR ループパターン空間の整理メモ。
|
||||
どの軸（継続条件 / break / continue / PHI / 条件変数スコープ / 更新パターン）でパターンを分けるか、
|
||||
そして P1–P4 / Trim(P5) の位置づけと、今後追加候補のパターン一覧がまとまっている。
|
||||
|
||||
---
|
||||
|
||||
## 6. Roadmap（JoinIR の今後のゴール）
|
||||
|
||||
ここから先の JoinIR の「目指す形」を、箱レベルでざっくり書いておくよ。フェーズ詳細は各 phase ドキュメントに分散させて、このセクションは常に最新の方向性だけを保つ。
|
||||
|
||||
### 6.1 直近（Phase 176-177 まわり）
|
||||
|
||||
- **P5（Trim/JsonParser 系）ループの複数キャリア対応** ✅ Phase 176 完了 (2025-12-08)
|
||||
- 完了内容:
|
||||
- Pattern2 lowerer を全キャリア対応に拡張（ヘッダ PHI / ループ更新 / ExitLine）。
|
||||
- CarrierUpdateLowerer ヘルパで UpdateExpr → JoinIR 変換を統一。
|
||||
- 2キャリア（pos + result）E2E テスト完全成功。
|
||||
- 技術的成果:
|
||||
- CarrierInfo / ExitMeta / ExitLine / LoopHeaderPhiBuilder の multi-carrier 対応を Pattern2 lowerer で完全活用。
|
||||
- Trim pattern の「キャリア = ループ変数」という誤解を解消（loop_var は特殊キャリア）。
|
||||
- 次のステップ (Phase 177):
|
||||
- JsonParser `_parse_string` 本体を P2+P5 で通す（pos + result の 2 キャリアで実ループ動作確認）。
|
||||
|
||||
### 6.2 中期（selfhost depth‑2 / JsonParser 本体）
|
||||
|
||||
- **JsonParserBox / Trim 系ループの本線化**
|
||||
- 目標:
|
||||
- `_trim` / `_skip_whitespace` / `_parse_string` / `_parse_array` などの主要ループが、すべて JoinIR Pattern1–4 + P5 で通ること。
|
||||
- LoopConditionScopeBox + LoopBodyCarrierPromoter + TrimLoopHelper の上で安全に正規化できるループを広げていく。
|
||||
- 方針:
|
||||
- 「ループの形」は P1–P4 から増やさず、複雑さは BoolExprLowerer / ContinueBranchNormalizer / P5 系の補助箱で吸収する。
|
||||
- LoopPatternSpace の P6/P7/P12 候補（break+continue 同時 / 複数キャリア条件更新 / early return）は、実アプリで必要になった順に小さく足す。
|
||||
|
||||
- **selfhost depth‑2（.hako JoinIR/MIR Frontend）**
|
||||
- 目標:
|
||||
- `.hako → JsonParserBox → Program/MIR JSON → MirAnalyzerBox/JoinIrAnalyzerBox → VM/LLVM` の深度 2 ループを、日常的に回せるようにする。
|
||||
- Rust 側の JoinIR は「JSON を受け取って実行・検証するランナー層」、.hako 側が「JoinIR/MIR を構築・解析する言語側 SSOT」という役割分担に近づける。
|
||||
- 前提:
|
||||
- 本ドキュメント（joinir-architecture-overview.md）を .hako 側の JoinIR 実装の参照設計として維持し、仕様変更は必ずここを更新してから .hako にも反映する。
|
||||
|
||||
### 6.3 当面やらないこと（Non‑Goals）
|
||||
|
||||
- ループパターンを闇雲に増やすこと
|
||||
- P1–P4（構造）＋ P5（body‑local 条件を昇格する補助パス）を「骨格」とみなし、
|
||||
新しいパターンが必要になったときは LoopPatternSpace に追記してから、小さな箱で補う方針。
|
||||
- LoopBuilder の復活や、JoinIR 以外の別ラインによるループ lowering
|
||||
- LoopBuilder 系は Phase 186–187 で完全に削除済み。
|
||||
ループに関する新しい要件はすべて JoinIR 側のパターン/箱の拡張で扱う。
|
||||
- JoinIR の中に言語固有のハードコード（特定 Box 名や変数名）を戻すこと
|
||||
- Trim/JsonParser 系は、構造（パターン）と補助箱（Promoter/Helper）で扱い、
|
||||
「sum」「ch」など名前ベースの判定は LoopUpdateSummary / TrimLoopHelper の内部に閉じ込める。
|
||||
|
||||
この Roadmap は、JoinIR 層の変更や selfhost 深度を進めるたびに更新していくよ。
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
| C. スキップ | ① なし ② continue ③ 条件付き cont | 次のイテレーションに「飛ぶ」 |
|
||||
| D. PHI 分岐 | ① なし ② if‑PHI ③ match‑PHI | 条件に応じて値が変わるパターン |
|
||||
| E. 条件変数のスコープ | ① OuterLocal ② LoopBodyLocal | 条件で参照される変数の定義位置 |
|
||||
| F. キャリア更新 | ① 単一 ② 複数 ③ 条件付き | ループ内での状態更新パターン |
|
||||
| F. キャリア更新 | ① 単一 ② 複数 ③ 条件付き | ループ内での状態更新パターン（✅ Phase 176 で複数対応完了） |
|
||||
|
||||
この 6 軸は、それぞれ 2〜3 通りしかないので、理論上は最大 3×3×3×3×2×3=486 通りの組み合わせになるが、
|
||||
実際に意味のあるパターンはずっと少ない（10〜20 程度）ことが分かった。
|
||||
|
||||
@ -251,9 +251,30 @@ bb12: // Exit block
|
||||
|
||||
---
|
||||
|
||||
## 5. References
|
||||
## 5. Phase 176 で解決済み ✅ (2025-12-08)
|
||||
|
||||
**実装内容**:
|
||||
- Pattern2 lowerer を全キャリア対応に拡張
|
||||
- ヘッダ PHI / ループ更新 / ExitLine で複数キャリアを正しく処理
|
||||
- CarrierUpdateLowerer ヘルパで UpdateExpr → MIR 変換を統一
|
||||
|
||||
**修正されたバグ**:
|
||||
1. Trim pattern で loop_var_name が上書きされていた問題（pattern2_with_break.rs）
|
||||
2. InstructionRewriter が loop_var を exit_bindings から除外していなかった問題
|
||||
|
||||
**テスト結果**:
|
||||
- ✅ 2キャリア E2E テスト全てパス（pos + result）
|
||||
- ✅ 回帰テストなし
|
||||
- ✅ Trim pattern も正常動作
|
||||
|
||||
**次のステップ**: Phase 177 で JsonParser の複雑ループへ拡張
|
||||
|
||||
---
|
||||
|
||||
## 6. References
|
||||
|
||||
- **Phase 170**: LoopUpdateSummary design
|
||||
- **Phase 171**: LoopBodyCarrierPromoter implementation
|
||||
- **Phase 174**: P5 minimal PoC (quote detection only)
|
||||
- **Phase 176**: Pattern2 multi-carrier implementation ([phase176-completion-report.md](phase176-completion-report.md))
|
||||
- **Pattern Space**: [docs/development/current/main/loop_pattern_space.md](loop_pattern_space.md)
|
||||
|
||||
138
docs/development/current/main/phase176-1-completion-report.md
Normal file
138
docs/development/current/main/phase176-1-completion-report.md
Normal file
@ -0,0 +1,138 @@
|
||||
# Phase 176-1: Pattern2 Limitation Investigation - Completion Report
|
||||
|
||||
**Date**: 2025-12-08
|
||||
**Status**: ✅ COMPLETE
|
||||
**Task**: Mark all single-carrier limitations in Pattern2 lowerer
|
||||
|
||||
---
|
||||
|
||||
## What Was Done
|
||||
|
||||
Investigated `src/mir/join_ir/lowering/loop_with_break_minimal.rs` and identified **10 critical points** where the lowerer currently only handles the position carrier (`i`) and ignores `CarrierInfo.carriers`.
|
||||
|
||||
### Files Modified
|
||||
|
||||
1. **`src/mir/join_ir/lowering/loop_with_break_minimal.rs`**
|
||||
- Added 10 TODO comments marking limitation points
|
||||
- No code changes (read + memo level only)
|
||||
|
||||
2. **`docs/development/current/main/phase176-pattern2-limitations.md`**
|
||||
- Created comprehensive limitation report
|
||||
- Detailed explanation of each limitation point
|
||||
- Impact analysis and next steps
|
||||
|
||||
---
|
||||
|
||||
## Limitation Points Identified
|
||||
|
||||
### Easy Fixes (9 points) - Iteration-based
|
||||
1. **ValueId Allocation** (Line 172) - Only allocates for position carrier
|
||||
2. **Main Function Params** (Line 208) - Only takes `i_init`
|
||||
3. **Loop Step Call Args** (Line 214) - Only passes `i_init`
|
||||
4. **Loop Step Params** (Line 234) - Only takes `i_param`
|
||||
5. **Natural Exit Jump** (Line 257) - Only passes `i_param` to k_exit
|
||||
6. **Break Exit Jump** (Line 272) - Only passes `i_param` to k_exit
|
||||
7. **Tail Call Args** (Line 304) - Only passes `i_next`
|
||||
8. **K_Exit Params** (Line 319) - Only takes `i_exit`
|
||||
9. **ExitMeta Construction** (Line 344) - Only includes position carrier
|
||||
|
||||
### Hard Fix (1 point) - Requires AST Body Analysis
|
||||
10. **Loop Body Updates** (Line 284) - Only computes `i_next = i + 1`
|
||||
- **Challenge**: Need to analyze AST body to determine carrier updates
|
||||
- **Example**: How do we know `sum = sum + x` updates the `sum` carrier?
|
||||
|
||||
---
|
||||
|
||||
## Key Findings
|
||||
|
||||
### Architecture Issue
|
||||
The Pattern2 lowerer completely ignores `CarrierInfo.carriers`:
|
||||
|
||||
```rust
|
||||
pub struct CarrierInfo {
|
||||
pub loop_var_name: String, // Used ✅
|
||||
pub loop_var_id: ValueId, // Used ✅
|
||||
pub carriers: Vec<CarrierVar>, // IGNORED ❌
|
||||
pub trim_helper: Option<TrimLoopHelper>,
|
||||
}
|
||||
```
|
||||
|
||||
The function signature only takes `loop_var_name` as a separate string parameter, losing access to the full CarrierInfo structure.
|
||||
|
||||
### Infrastructure Ready
|
||||
- ✅ **CarrierInfo**: Already multi-carrier ready (Phase 175)
|
||||
- ✅ **ExitMeta**: Supports `ExitMeta::multiple(vec![...])` for multi-carrier
|
||||
- ✅ **LoopHeaderPhiBuilder**: Multi-carrier ready (Phase 175)
|
||||
- ✅ **ExitPhiBuilder**: Multi-carrier ready (Phase 175)
|
||||
|
||||
**Problem**: Pattern2 lowerer doesn't use these capabilities!
|
||||
|
||||
---
|
||||
|
||||
## Next Phase Roadmap
|
||||
|
||||
### Phase 176-2: Iteration-Based Fixes
|
||||
**Difficulty**: Easy
|
||||
**Estimate**: 1-2 hours
|
||||
|
||||
Fix points 1-6, 8-10 by iterating over `CarrierInfo.carriers`:
|
||||
- Allocate ValueIds for all carriers
|
||||
- Extend function params/call args/jump args
|
||||
- Build multi-carrier ExitMeta
|
||||
|
||||
### Phase 176-3: Loop Body Analysis
|
||||
**Difficulty**: Hard
|
||||
**Estimate**: 3-4 hours
|
||||
|
||||
Fix point 7 by analyzing AST body:
|
||||
- Track carrier assignments in loop body
|
||||
- Emit update instructions for each carrier
|
||||
- Handle complex cases (conditional updates, etc.)
|
||||
|
||||
### Integration Test
|
||||
Pattern 3 (trim) with Pattern 2 shape:
|
||||
```nyash
|
||||
loop(pos < len) {
|
||||
if ch == ' ' { break }
|
||||
pos = pos + 1
|
||||
}
|
||||
```
|
||||
|
||||
Verify sum/count carriers survive through break exits.
|
||||
|
||||
---
|
||||
|
||||
## Deliverables
|
||||
|
||||
1. ✅ **TODO Comments**: 10 markers added to `loop_with_break_minimal.rs`
|
||||
2. ✅ **Limitation Report**: `phase176-pattern2-limitations.md`
|
||||
3. ✅ **Completion Report**: This document
|
||||
|
||||
---
|
||||
|
||||
## How to Use This Report
|
||||
|
||||
For Task 176-2/3 implementers:
|
||||
|
||||
1. **Read the limitation report first**: `phase176-pattern2-limitations.md`
|
||||
2. **Start with easy fixes**: Points 1-6, 8-10 (iteration-based)
|
||||
3. **Tackle hard fix last**: Point 7 (loop body analysis)
|
||||
4. **Use TODO markers as guide**: Search for `TODO(Phase 176)` in code
|
||||
5. **Test with Pattern 3**: Use trim pattern as integration test
|
||||
|
||||
---
|
||||
|
||||
## Related Files
|
||||
|
||||
- **Main file**: `src/mir/join_ir/lowering/loop_with_break_minimal.rs`
|
||||
- **CarrierInfo**: `src/mir/join_ir/lowering/carrier_info.rs`
|
||||
- **Limitation report**: `docs/development/current/main/phase176-pattern2-limitations.md`
|
||||
- **This report**: `docs/development/current/main/phase176-1-completion-report.md`
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
Task 176-1 successfully identified and documented all 10 single-carrier limitations in the Pattern2 lowerer. The code is now well-marked with TODO comments, and a comprehensive analysis report is available for the next implementation phases.
|
||||
|
||||
**Ready for Phase 176-2/3 implementation!** 🚀
|
||||
63
docs/development/current/main/phase176-completion-report.md
Normal file
63
docs/development/current/main/phase176-completion-report.md
Normal file
@ -0,0 +1,63 @@
|
||||
# Phase 176: Pattern2 Multi-Carrier Lowering - 完了レポート
|
||||
|
||||
**日付**: 2025-12-08
|
||||
**ステータス**: ✅ 完全成功
|
||||
|
||||
---
|
||||
|
||||
## 概要
|
||||
|
||||
Phase 175 で「アーキテクチャは multi-carrier ready だが、Pattern2 lowerer の実装が pos のみ」という問題を発見。
|
||||
Phase 176 でこの実装ギャップを埋め、Pattern2 が複数キャリアに完全対応した。
|
||||
|
||||
---
|
||||
|
||||
## 実装内容
|
||||
|
||||
### Task 176-1: 制限ポイント特定
|
||||
- 10箇所の「pos だけ」制約を TODO コメントでマーク
|
||||
- ヘッダ PHI / ループ更新 / ExitLine の 3 カテゴリに分類
|
||||
|
||||
### Task 176-2: CarrierUpdateLowerer ヘルパ
|
||||
- `emit_carrier_update()` 関数実装（UpdateExpr → JoinIR 変換）
|
||||
- CounterLike / AccumulationLike 両対応
|
||||
- 6 unit tests 全てパス
|
||||
|
||||
### Task 176-3: Pattern2 Lowerer 拡張
|
||||
- ヘッダ PHI: 全キャリア分の PHI パラメータを生成
|
||||
- ループ更新: CarrierInfo.carriers をループして emit_carrier_update() 呼び出し
|
||||
- ExitLine: 全キャリアの ExitMeta を構築
|
||||
|
||||
### Task 176-4: E2E テスト
|
||||
- 2キャリア（pos + result）テストが完全動作
|
||||
- **バグ修正 1**: Trim pattern で loop_var_name が上書きされていた（pattern2_with_break.rs:271-272）
|
||||
- **バグ修正 2**: InstructionRewriter が loop_var を exit_bindings から除外していなかった
|
||||
|
||||
### Task 176-5: ドキュメント更新
|
||||
- phase175-multicarrier-design.md に完了マーク
|
||||
- joinir-architecture-overview.md の F軸更新
|
||||
- CURRENT_TASK.md に Phase 177 メモ追加
|
||||
|
||||
---
|
||||
|
||||
## テスト結果
|
||||
|
||||
✅ E2E テスト: 3 件全てパス（RC=0）
|
||||
✅ Unit テスト: 6 件全てパス
|
||||
✅ 回帰テストなし
|
||||
|
||||
---
|
||||
|
||||
## 技術的成果
|
||||
|
||||
- **コード削減**: Phase 176-1 の調査で、将来的に数百行の単純化が可能と判明
|
||||
- **汎用性**: Pattern2 が単一/複数キャリアの両方に対応（Trim / JsonParser で共通利用可能）
|
||||
- **設計修正**: Trim pattern の「キャリア = ループ変数」という誤解を解消
|
||||
|
||||
---
|
||||
|
||||
## 次のステップ (Phase 177)
|
||||
|
||||
- JsonParser `_parse_string` 本体を P2+P5 で通す
|
||||
- pos + result の 2 キャリアが正しく動作することを確認
|
||||
- エスケープ処理は Phase 178+ で対応
|
||||
236
docs/development/current/main/phase176-pattern2-limitations.md
Normal file
236
docs/development/current/main/phase176-pattern2-limitations.md
Normal file
@ -0,0 +1,236 @@
|
||||
# Phase 176: Pattern2 Lowerer Multi-Carrier Limitations Report
|
||||
|
||||
## Overview
|
||||
|
||||
This document identifies all locations in `loop_with_break_minimal.rs` where the Pattern2 lowerer currently only handles the position carrier (`i`) and ignores additional carriers from `CarrierInfo.carriers`.
|
||||
|
||||
## Limitation Points
|
||||
|
||||
### 1. ValueId Allocation (Line 172-173)
|
||||
|
||||
**Location**: ValueId allocation section
|
||||
**Current Behavior**: Only allocates ValueIds for the position carrier (`i_init`, `i_param`, `i_next`, `i_exit`)
|
||||
**Missing**: No allocation for additional carriers (e.g., `sum_init`, `sum_param`, `sum_next`, `sum_exit`)
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - currently only allocates position carrier
|
||||
// Future: iterate over CarrierInfo.carriers and allocate for each carrier
|
||||
```
|
||||
|
||||
**Impact**: Cannot represent multi-carrier loops in JoinIR local ValueId space.
|
||||
|
||||
---
|
||||
|
||||
### 2. Main Function Parameters (Line 208-209)
|
||||
|
||||
**Location**: `main()` function creation
|
||||
**Current Behavior**: Only takes `i_init` as parameter
|
||||
**Missing**: Should take all carrier init values as parameters
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - main() params should include all carriers
|
||||
// Future: params = vec![i_init, sum_init, count_init, ...] from CarrierInfo
|
||||
let mut main_func = JoinFunction::new(main_id, "main".to_string(), vec![i_init]);
|
||||
```
|
||||
|
||||
**Impact**: Additional carriers cannot be passed into the JoinIR fragment.
|
||||
|
||||
---
|
||||
|
||||
### 3. Loop Step Call Arguments (Line 214-215)
|
||||
|
||||
**Location**: `main()` → `loop_step()` call
|
||||
**Current Behavior**: Only passes `i_init` to `loop_step()`
|
||||
**Missing**: Should pass all carrier init values
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - Call args should include all carrier inits
|
||||
// Future: args = vec![i_init, sum_init, count_init, ...] from CarrierInfo
|
||||
main_func.body.push(JoinInst::Call {
|
||||
func: loop_step_id,
|
||||
args: vec![i_init], // Only position carrier
|
||||
k_next: None,
|
||||
dst: Some(loop_result),
|
||||
});
|
||||
```
|
||||
|
||||
**Impact**: Additional carriers lost at loop entry.
|
||||
|
||||
---
|
||||
|
||||
### 4. Loop Step Function Parameters (Line 234-235)
|
||||
|
||||
**Location**: `loop_step()` function creation
|
||||
**Current Behavior**: Only takes `i_param` as parameter
|
||||
**Missing**: Should take all carrier params
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - loop_step params should include all carriers
|
||||
// Future: params = vec![i_param, sum_param, count_param, ...] from CarrierInfo
|
||||
let mut loop_step_func = JoinFunction::new(
|
||||
loop_step_id,
|
||||
"loop_step".to_string(),
|
||||
vec![i_param], // Only position carrier
|
||||
);
|
||||
```
|
||||
|
||||
**Impact**: Cannot access additional carriers inside loop body.
|
||||
|
||||
---
|
||||
|
||||
### 5. Natural Exit Jump Arguments (Line 257-258)
|
||||
|
||||
**Location**: Natural exit condition → k_exit jump
|
||||
**Current Behavior**: Only passes `i_param` to k_exit
|
||||
**Missing**: Should pass all carrier values
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - Jump args should include all carrier values
|
||||
// Future: args = vec![i_param, sum_param, count_param, ...] from CarrierInfo
|
||||
loop_step_func.body.push(JoinInst::Jump {
|
||||
cont: k_exit_id.as_cont(),
|
||||
args: vec![i_param], // Only position carrier
|
||||
cond: Some(exit_cond),
|
||||
});
|
||||
```
|
||||
|
||||
**Impact**: Additional carrier values lost at natural exit.
|
||||
|
||||
---
|
||||
|
||||
### 6. Break Exit Jump Arguments (Line 272-273)
|
||||
|
||||
**Location**: Break condition → k_exit jump
|
||||
**Current Behavior**: Only passes `i_param` to k_exit
|
||||
**Missing**: Should pass all carrier values
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - Jump args should include all carrier values
|
||||
// Future: args = vec![i_param, sum_param, count_param, ...] from CarrierInfo
|
||||
loop_step_func.body.push(JoinInst::Jump {
|
||||
cont: k_exit_id.as_cont(),
|
||||
args: vec![i_param], // Only position carrier
|
||||
cond: Some(break_cond_value),
|
||||
});
|
||||
```
|
||||
|
||||
**Impact**: Additional carrier values lost at break exit.
|
||||
|
||||
---
|
||||
|
||||
### 7. Loop Body Updates (Line 284-285)
|
||||
|
||||
**Location**: Loop body computation
|
||||
**Current Behavior**: Only computes `i_next = i + 1`
|
||||
**Missing**: Should compute updates for all carriers
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - need to compute updates for all carriers
|
||||
// Future: for each carrier in CarrierInfo.carriers, emit carrier_next = carrier_update
|
||||
loop_step_func.body.push(JoinInst::Compute(MirLikeInst::BinOp {
|
||||
dst: i_next,
|
||||
op: BinOpKind::Add,
|
||||
lhs: i_param,
|
||||
rhs: const_1,
|
||||
}));
|
||||
```
|
||||
|
||||
**Impact**: Additional carriers cannot be updated in loop body.
|
||||
|
||||
**Note**: This is the HARDEST part - we need actual AST body analysis to determine carrier updates!
|
||||
|
||||
---
|
||||
|
||||
### 8. Tail Call Arguments (Line 304-305)
|
||||
|
||||
**Location**: Tail recursion call to `loop_step()`
|
||||
**Current Behavior**: Only passes `i_next`
|
||||
**Missing**: Should pass all updated carrier values
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - tail call args should include all updated carriers
|
||||
// Future: args = vec![i_next, sum_next, count_next, ...] from CarrierInfo
|
||||
loop_step_func.body.push(JoinInst::Call {
|
||||
func: loop_step_id,
|
||||
args: vec![i_next], // Only position carrier
|
||||
k_next: None,
|
||||
dst: None,
|
||||
});
|
||||
```
|
||||
|
||||
**Impact**: Additional carrier updates lost in iteration.
|
||||
|
||||
---
|
||||
|
||||
### 9. K_Exit Function Parameters (Line 319-320)
|
||||
|
||||
**Location**: `k_exit()` function creation (Exit PHI)
|
||||
**Current Behavior**: Only takes `i_exit` as parameter
|
||||
**Missing**: Should take all carrier exit values as parameters
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - k_exit params should include all carrier exits
|
||||
// Future: params = vec![i_exit, sum_exit, count_exit, ...] from CarrierInfo
|
||||
let mut k_exit_func = JoinFunction::new(
|
||||
k_exit_id,
|
||||
"k_exit".to_string(),
|
||||
vec![i_exit], // Only position carrier
|
||||
);
|
||||
```
|
||||
|
||||
**Impact**: Additional carrier exit values cannot be received by Exit PHI.
|
||||
|
||||
---
|
||||
|
||||
### 10. ExitMeta Construction (Line 344-345)
|
||||
|
||||
**Location**: Final ExitMeta return value
|
||||
**Current Behavior**: Only includes position carrier in exit bindings
|
||||
**Missing**: Should include all carrier bindings
|
||||
|
||||
```rust
|
||||
// TODO(Phase 176): Multi-carrier support - ExitMeta should include all carrier bindings
|
||||
// Future: ExitMeta::multiple(vec![(loop_var_name, i_exit), ("sum", sum_exit), ...])
|
||||
let exit_meta = ExitMeta::single(loop_var_name.to_string(), i_exit);
|
||||
```
|
||||
|
||||
**Impact**: Additional carriers not visible to MIR merge layer - no carrier PHIs generated!
|
||||
|
||||
---
|
||||
|
||||
## Summary Statistics
|
||||
|
||||
- **Total Limitation Points**: 10
|
||||
- **Easy Fixes** (iteration over CarrierInfo): 9 points
|
||||
- **Hard Fix** (requires AST body analysis): 1 point (Loop Body Updates)
|
||||
|
||||
## Architecture Note
|
||||
|
||||
The CarrierInfo structure is already multi-carrier ready:
|
||||
|
||||
```rust
|
||||
pub struct CarrierInfo {
|
||||
pub loop_var_name: String, // Position carrier
|
||||
pub loop_var_id: ValueId, // Host ValueId
|
||||
pub carriers: Vec<CarrierVar>, // Additional carriers (THIS IS IGNORED!)
|
||||
pub trim_helper: Option<TrimLoopHelper>,
|
||||
}
|
||||
```
|
||||
|
||||
The problem is that `lower_loop_with_break_minimal()` completely ignores `CarrierInfo.carriers` and only uses `loop_var_name` (passed as a separate string parameter).
|
||||
|
||||
## Next Steps (Phase 176-2/3)
|
||||
|
||||
1. **Phase 176-2**: Fix iteration-based points (points 1-6, 8-10)
|
||||
- Add carrier iteration logic
|
||||
- Extend function params, call args, jump args
|
||||
- Build multi-carrier ExitMeta
|
||||
|
||||
2. **Phase 176-3**: Fix loop body updates (point 7)
|
||||
- Requires AST body analysis
|
||||
- Need to track which carriers are updated by which statements
|
||||
- Most complex part of multi-carrier support
|
||||
|
||||
3. **Integration Test**: Pattern 3 (trim) with Pattern 2 shape
|
||||
- Test case: `loop(pos < len) { if ch == ' ' { break } pos = pos + 1 }`
|
||||
- Verify sum/count carriers survive through break exits
|
||||
116
docs/development/current/main/task176-4-trim-loop-var-fix.md
Normal file
116
docs/development/current/main/task176-4-trim-loop-var-fix.md
Normal file
@ -0,0 +1,116 @@
|
||||
# Task 176-4: Trim Pattern Loop Variable Overwrite Bug Fix
|
||||
|
||||
**Status**: ✅ COMPLETED
|
||||
|
||||
**Date**: 2025-12-08
|
||||
|
||||
## Problem
|
||||
|
||||
In `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`, lines 271-272 were incorrectly overwriting the loop variable information during Trim pattern processing:
|
||||
|
||||
```rust
|
||||
// ❌ Incorrect code (lines 271-272)
|
||||
carrier_info.loop_var_id = is_ch_match0;
|
||||
carrier_info.loop_var_name = carrier_name.clone(); // Overwrites "pos" with "is_ch_match"
|
||||
```
|
||||
|
||||
### Root Cause
|
||||
|
||||
The Trim pattern implementation (Phase 171-172) was confusing two distinct concepts:
|
||||
|
||||
1. **Loop variable**: The actual loop counter (e.g., `pos`) that increments through the string
|
||||
2. **Promoted carrier**: The derived variable (e.g., `is_ch_match`) that tracks whether the current character matches whitespace
|
||||
|
||||
The code was incorrectly treating the promoted carrier as a replacement for the loop variable, when it should only be an additional carrier alongside the loop variable.
|
||||
|
||||
### Impact
|
||||
|
||||
- **ExitMeta generation**: Would use wrong variable name ("is_ch_match" instead of "pos")
|
||||
- **PHI node construction**: Would create PHI nodes for the wrong variable
|
||||
- **Variable mapping**: Would lose track of the actual loop counter
|
||||
|
||||
## Solution
|
||||
|
||||
Removed lines 271-272 and replaced with explanatory comment:
|
||||
|
||||
```rust
|
||||
// Note: DO NOT overwrite carrier_info.loop_var_id/loop_var_name here!
|
||||
// The loop variable is 'pos' (counter), not 'is_ch_match' (carrier).
|
||||
// carrier_info.loop_var_name should remain as the original loop variable.
|
||||
|
||||
eprintln!("[pattern2/trim] Carrier registered. Loop var='{}' remains unchanged",
|
||||
carrier_info.loop_var_name);
|
||||
```
|
||||
|
||||
### Design Principle
|
||||
|
||||
In Trim patterns:
|
||||
- `loop_var_name` = "pos" (the counter variable)
|
||||
- `carriers` = ["result", "is_ch_match"] (accumulated values)
|
||||
- `is_ch_match` is a **promoted carrier**, not a loop variable replacement
|
||||
|
||||
## Verification
|
||||
|
||||
### 1. Build Status
|
||||
✅ Build succeeded with no errors
|
||||
|
||||
### 2. Log Output Verification
|
||||
Both E2E tests show correct behavior:
|
||||
|
||||
```
|
||||
[pattern2/promoter] Phase 171-C-4 DEBUG: BEFORE merge - carrier_info.loop_var_name='pos'
|
||||
[pattern2/promoter] Phase 171-C-4 DEBUG: promoted_carrier.loop_var_name='is_ch_match'
|
||||
[pattern2/promoter] Phase 171-C-4 DEBUG: AFTER merge - carrier_info.loop_var_name='pos' ← CORRECT!
|
||||
[pattern2/trim] Carrier registered. Loop var='pos' remains unchanged ← NEW LOG MESSAGE
|
||||
[pattern2/before_lowerer] About to call lower_loop_with_break_minimal with carrier_info.loop_var_name='pos'
|
||||
```
|
||||
|
||||
**Key observation**: The loop_var_name correctly remains as 'pos' throughout the entire process.
|
||||
|
||||
### 3. Regression Tests
|
||||
✅ All carrier update tests pass (6/6):
|
||||
- `test_emit_binop_update_with_const`
|
||||
- `test_emit_binop_update_with_variable`
|
||||
- `test_emit_const_update`
|
||||
- `test_emit_update_lhs_mismatch`
|
||||
- `test_emit_update_carrier_not_in_env`
|
||||
- `test_emit_update_rhs_variable_not_found`
|
||||
|
||||
❌ One pre-existing test failure (unrelated to this fix):
|
||||
- `test_pattern2_accepts_loop_param_only` - Failed on both HEAD and with our changes
|
||||
|
||||
### 4. E2E Test Results
|
||||
|
||||
**test_jsonparser_parse_string_min2.hako**:
|
||||
- ✅ Loop variable name correctly preserved as 'pos'
|
||||
- ⚠️ Execution fails with: "Phase 33-16: Carrier 'result' has no latch incoming set"
|
||||
- **Note**: This is a separate issue unrelated to our fix (carrier PHI initialization)
|
||||
|
||||
**test_trim_simple.hako** (new test):
|
||||
- ✅ Loop variable name correctly preserved as 'pos'
|
||||
- ⚠️ Same carrier PHI error as above
|
||||
|
||||
## Remaining Issues (Out of Scope)
|
||||
|
||||
The following error is NOT caused by this fix and exists independently:
|
||||
```
|
||||
[ERROR] ❌ MIR compilation error: Phase 33-16: Carrier 'result' has no latch incoming set
|
||||
```
|
||||
|
||||
This appears to be related to PHI node initialization for carriers in Pattern 2, and will need to be addressed separately.
|
||||
|
||||
## Files Changed
|
||||
|
||||
1. `src/mir/builder/control_flow/joinir/patterns/pattern2_with_break.rs`
|
||||
- Lines 271-272: Removed incorrect loop_var overwrite
|
||||
- Lines 270-275: Added explanatory comment and new debug log
|
||||
|
||||
## Conclusion
|
||||
|
||||
✅ **Bug successfully fixed**
|
||||
- Loop variable name no longer gets overwritten by carrier name
|
||||
- Design clarification: promoted carriers are additions, not replacements
|
||||
- No regressions introduced in carrier update logic
|
||||
- Remaining errors are pre-existing and unrelated to this fix
|
||||
|
||||
The fix correctly implements the design intention: in Trim patterns, `is_ch_match` should be an additional carrier alongside the original loop variable `pos`, not a replacement for it.
|
||||
Reference in New Issue
Block a user