Commit Graph

1905 Commits

Author SHA1 Message Date
6fa2a95bdf chore(joinir): Phase 40-4.1.1 dead code cleanup (16 lines)
- Remove use_joinir_for_array_filter() from env.rs (9 lines)
  Route B is now default, env flag no longer needed

- Remove next_var_id() from ast_lowerer.rs (7 lines)
  Duplicate of alloc_var() method

Cumulative deletion: 51 lines (35 + 16)
Tests: 5/5 Phase 40 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 11:31:18 +09:00
59f7f03efb feat(joinir): Phase 40-4.1 delete collect_assigned_vars (35 lines)
Breaking: collect_assigned_vars function removed from if_phi.rs

Changes:
- Delete collect_assigned_vars() function (35 lines)
- Make JoinIR route the default in loop_builder.rs
- Rewrite collect_assigned_vars_via_joinir() with ast_to_json support
  - Now detects both Local declarations and Assignment nodes
  - Add extract_vars_from_json_stmts/stmt helpers
- Update tests to use new implementation
  - phase40_joinir_detects_local_declarations
  - phase40_joinir_nested_if_local

Test results: 407 passed, 11 failed (same as before, no regression)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 11:07:01 +09:00
c7975d4bd9 feat(joinir): Phase 40-3.5 route switching implementation
- Add collect_assigned_vars_via_joinir() in if_phi.rs (65 lines)
  - Wrapper using Phase 40-1 JoinIR infrastructure
  - Converts ASTNode to JSON and calls JoinIR analysis
- Add route switching in loop_builder.rs
  - Check HAKO_JOINIR_ARRAY_FILTER env flag
  - Route A: Legacy collect_assigned_vars path
  - Route B: JoinIR collect_assigned_vars_via_joinir path
- Add A/B tests in phase40_array_ext_filter_test.rs
  - phase40_ab_route_switching: Basic assignment detection
  - phase40_ab_nested_if: Nested if assignment detection
- All 5 Phase 40 tests PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 10:51:34 +09:00
29058d2c9a feat(phase40-3): dev flag実装 + テストインフラ準備
Phase 40-3成果:
- dev flag追加: use_joinir_for_array_filter() (env.rs)
- テストドキュメント更新 (phase40_array_ext_filter_test.rs)

フルパイプライン統合はPhase 40-3.5+に延期

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 10:34:50 +09:00
aa0b3972b9 docs(phase40-2): CURRENT_TASK.md Phase 40-2セクション追加
Phase 40-2設計フェーズ完了記録:
- パイプライン移行設計(現状→目標)
- 対象関数確定(array_ext.filter)
- 経路切替ポイント(loop_builder.rs:1069, 1075)
- A/Bテスト方針
- 削除条件(3条件)

コード変更: なし(docs-only)
次のステップ: Phase 40-3マイグレーションフェーズ

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 10:13:53 +09:00
88358a4086 feat(joinir): Phase 40-1 JoinFuncMetaインフラ構築
Phase 40-1成果:
- JoinFuncMeta構造体 + JoinFuncMetaMap型(func_meta.rs)
- lower_loop_with_if_meta() 実験用API
- convert_join_module_to_mir_with_meta() MIRラッパ
- extract_if_in_loop_modified_vars() helper methods
- Integration tests 3/3 PASS

削減: 0行(レガシー経路が現役のため保留)
成果: JoinIR SSOTへの橋を架けた

新規ファイル:
- src/mir/join_ir/frontend/func_meta.rs (25行)
- src/tests/joinir_frontend_if_in_loop_test.rs (160行)
- src/tests/phase40_array_ext_filter_test.rs (135行)

変更ファイル:
- src/mir/join_ir/frontend/ast_lowerer.rs (+89行)
- src/mir/join_ir_vm_bridge.rs (+80行)
- src/tests/mod.rs (+2行)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 09:26:28 +09:00
a3f617874d feat(joinir): Add Phase 40 implementation templates and integration points
Phase 35-39整理(C): JoinIR Frontend拡張雛形作成
- ast_lowerer.rs: extract_if_in_loop_modified_vars() template (~80 lines)
- ast_lowerer.rs: extract_assigned_vars_from_body() template (~80 lines)
- ast_lowerer.rs: lower_loop_case_a_simple() integration point marked
- join_ir_vm_bridge.rs: convert_join_function_to_mir() extension template (~100 lines)

Templates include:
- Detailed purpose and implementation plan
- Integration points in existing code
- Example usage (array_ext.filter)
- Links to Phase 39 design docs
- TODO(Phase 40-1/2/3/4) markers

Effect: Phase 40 implementation ready to start (追加箇所明確、実装漏れ防止)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 07:34:26 +09:00
231eb6e138 docs(phi-reduction): Add Phase 40/41+ deletion markers to if_phi.rs/conservative.rs
Phase 35-39整理(B): ソースコード責務マーキング
- if_phi.rs: Module-level Phase 35-41+ deletion plan added
- if_phi.rs: Function-level markers for Level 2/3 targets
- conservative.rs: Phase 40/41+ deletion plan added

Markers include:
- Deletion phase (40-1/40-2/40-3/40-4, 41+)
- Deletion conditions (prerequisites)
- Replacement path (JoinIR Frontend, JoinIR Verifier)
- Callsites (file:line)
- Reduction effect (line counts)

Effect: Deletion plan visible in code for developers and AI agents

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 07:30:01 +09:00
9e97e114eb chore: Update docs/private submodule (Phase 39 Level 2 preparation)
Phase 39 documentation complete:
- Stage-1/Stage-B representative function selection (5 candidates → top 2)
  - Primary: array_ext.filter (8/10 score, if-in-loop with conditional push)
  - Secondary: json_cur.read_quoted_from (7/10 score, comprehensive validation)
- JoinIR Frontend extension design (AST lowering, MIR lowering, ~120 lines)
  - if-in-loop AST lowering with variable tracking (~80 lines)
  - Loop exit PHI generation (~40 lines)
  - A/B test plan with 5 test fixtures
- Deletion criteria refinement (abstract → concrete checklist)
  - Verification Procedures: 3 procedures defined
  - Deletion sequence: Phase 40-1 through 40-4 roadmap
- Gap analysis (JoinIR Frontend coverage gaps identified)
  - collect_assigned_vars: 30% coverage (70% gap: if-in-loop variable capture)
  - compute_modified_names: 50% coverage (50% gap: conservative strategy)
  - merge_with_reset_at_merge_with: 80% coverage (20% gap: reset semantics)

CURRENT_TASK.md updated with Phase 39 completion
Zero functional code changes (docs-only phase)

Phase 39 complete: Level 2 deletion concrete implementation plan established
Total planned deletion: 115 lines (Phase 40)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 06:08:10 +09:00
bec2e2ffe6 feat(joinir): Phase 38 If-side PHI Level 1 deletion (90 lines, LOW safety)
Phase 38: Level 1 deletion complete (exceeded target by 22 lines)
- Deleted merge_modified_with_control (51 lines, dead code, 0 callsites)
- Deleted extract_assigned_var (39 lines, JoinIR AST lowering replacement)
- Updated callsites: if_form.rs (2), phi.rs (2) → replaced with None

File changes:
- if_phi.rs: 315 → 225 lines (90 lines, 28.6% reduction)
- Callsites updated: 4 sites (if_form.rs, phi.rs)

Technical achievements:
 JoinIR coverage verification (None replacement passes all tests)
 Dead code elimination (merge_modified_with_control 0 callsites)
 Staged deletion strategy validation (Phase 37 3-level plan works)

Test results:
 cargo build --release: Clean
 PHI tests: 58/58 PASS (no regression)
 JoinIR Frontend tests: 37/38 PASS (1 failure pre-existing test ordering)
 Full lib tests: 399-400/460 PASS (10-12 non-deterministic failures baseline)

Phase 35-38 cumulative: 605 lines deleted (430+107+90)
Phase 39+ potential: 415 lines (Level 2: 115, Level 3: 300)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 05:01:04 +09:00
616767ca06 chore: Update docs/private submodule (Phase 37 If-side PHI design)
Phase 37 documentation complete:
- If/PHI responsibility inventory (12 critical callsites)
- JoinIR coverage mapping (Phase 33-34)
- 3-level deletion criteria (Level 1/2/3)
- Deletion sequence plan (Phase 38/39/40+)

CURRENT_TASK.md updated with Phase 37 completion:
- Section 1-00j added with full design summary
- 483 lines deletion potential (Phase 38/39/40+)
- Zero functional code changes (docs-only phase)

Phase 35-37 cumulative: 537 lines deleted + 483 lines planned

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 04:41:44 +09:00
1beb9181cd chore: Update docs/private submodule (Phase 36 final docs)
Phase 36 documentation completion:
- PHI_BOX_INVENTORY.md updated with reduction records
- README.md/TASKS.md completion status
- CURRENT_TASK.md Phase 36 section added

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 04:29:04 +09:00
e202b95555 feat(joinir): Phase 36 PHI box midrange reduction (MEDIUM safety)
Phase 36-4: LoopSnapshotMergeBox reduction (470 → 363 lines, 22.8%)
- Removed dead code: merge_continue_for_header() + tests (~100 lines)
- Removed superseded helpers: optimize_same_value/sanitize_inputs + tests (~94 lines)
- Removed unused fields: header_phi_inputs/exit_phi_inputs + new/Default (~19 lines)
- Converted to pure static utility (no state, only static methods)

Phase 36-5: PhiBuilderBox responsibility markers
- Added Phase 36 Responsibility Classification section to file header
- Added responsibility markers to all public methods:
  - Loop-only: set_if_context() (if-in-loop PHI context)
  - Common: new(), generate_phis() (stable API for both If and Loop)
  - If-only: generate_if_phis(), compute_modified_names_if(), get_conservative_if_values()
  - Stub: generate_loop_phis() (Phase 37+ implementation target)
- No code changes (markers only)

LoopSnapshotMergeBox changes:
- Removed merge_continue_for_header(): NEVER CALLED in production
- Removed optimize_same_value(): superseded by PhiInputCollector::optimize_same_value()
- Removed sanitize_inputs(): superseded by PhiInputCollector::sanitize()
- Removed test_merge_continue_for_header_*: tests for dead method
- Removed test_optimize_same_value_*: tests for superseded method
- Removed test_sanitize_inputs_*: tests for superseded method
- Added 3 new tests for merge_exit_with_classification():
  - test_merge_exit_with_classification_simple_carrier(): carrier variable
  - test_merge_exit_with_classification_skips_body_local_internal(): Option C logic
  - test_merge_exit_with_classification_break_only_loop(): Case B (header not in exit preds)

PhiBuilderBox changes:
- No wrapper created (hybrid usage pattern - only 1 Loop-specific method)
- Responsibility markers document Loop/If/Common method classification
- Usage pattern clarified: if-in-loop PHI vs loop PHI

Test results:
 cargo build --release: Clean build
 Loop tests: All PASS (no regression)
 If tests: All PASS (unchanged)
 Phase 34 tests: All PASS

Line reduction: 107 lines (LoopSnapshotMergeBox)
Phase 37+ potential: ~3,275 lines remaining

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 02:04:26 +09:00
5cdf84248f chore: Update docs/private submodule (Phase 35-4 completion) 2025-11-28 01:19:14 +09:00
c2fb9dab6b feat(joinir): Phase 35-5 PHI box deletion (430 lines HIGH safety)
Phase 35-5: First wave deletion
- Deleted if_body_local_merge.rs (339 lines, 0 external calls)
  - Inlined logic into PhiBuilderBox::compute_modified_names_if()
  - Absorbed into PhiBuilderBox (isolated box with no external dependencies)
- Deleted phi_invariants.rs (91 lines, moved to JoinIR Verifier)
  - Removed ensure_if_values_exist() call from phi_builder_box.rs
  - Validation responsibility transferred to JoinIR Verifier
- Updated PHI_BOX_INVENTORY.md with deletion records

Phase 35-3/4: Documentation and route unification
- Added frontend_covered column to PHI_BOX_INVENTORY.md
- Documented JoinIR Runner routes (Route A: SSOT, Route B: structure validation)
- Updated join_ir_runner.rs module docstring with clear route guidelines

Build and test status:
 cargo build --release: Clean
 Phase 34 tests: All PASS (no regression)
 JoinIR tests: joinir_frontend_if_select, test_if_merge_simple_pattern PASS

Total reduction: 430 lines (HIGH safety achieved)
Phase 36+ potential: ~3,275 lines (MEDIUM/LOW safety)

Related docs:
- docs/private/roadmap2/phases/phase-35-phi-reduction/README.md
- docs/private/roadmap2/phases/phase-35-phi-reduction-investigation-report.md
- docs/private/roadmap2/phases/phase-30-final-joinir-world/PHI_BOX_INVENTORY.md

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 01:18:57 +09:00
853d80ba74 feat(joinir): Phase 34-7.5 helpers + Phase 34-8 Break/Continue implementation
Phase 34-7.5: Code organization improvements
- Added type conversion helpers (as_cont/as_func) in join_ir/mod.rs
- Enhanced docstrings for JoinCall/JoinJump with usage examples
- Improved error messages in join_ir_vm_bridge.rs

JoinIrFrontendTestRunner box implementation
- Created src/tests/helpers/joinir_frontend.rs (119 lines)
- Reduced test code by 83% (70 lines → 12 lines per test)
- 26% overall reduction in test file (284 → 209 lines)

Phase 34-8: Break/Continue pattern implementation
- Extended ast_lowerer.rs (+630 lines)
  - lower_loop_break_pattern(): Break as Jump (early return)
  - lower_loop_continue_pattern(): Continue as Select + Call
  - Added Bool literal support in extract_value()
- Created 2 fixtures: loop_frontend_{break,continue}.program.json
- Added 2 A/B tests (all 6 Phase 34 tests PASS)

Technical achievements:
- Break = Jump (early return pattern)
- Continue = Select + Call (NOT Jump) - critical discovery
- 3-function structure sufficient (no k_continue needed)
- SSA-style re-assignment with natural var_map updates

Test results:
 joinir_frontend_if_select_simple_ab_test
 joinir_frontend_if_select_local_ab_test
 joinir_frontend_json_shape_read_value_ab_test
 joinir_frontend_loop_simple_ab_test
 joinir_frontend_loop_break_ab_test
 joinir_frontend_loop_continue_ab_test

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-28 01:02:49 +09:00
a22726934d chore: Update docs/private submodule (Phase 34-6 docs)
🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 17:06:17 +09:00
588129db65 feat(joinir): Phase 34-6 MethodCall 構造と本物の substring 意味論
**Phase 34-6 実装完了**: MethodCall 構造を JoinIR に追加し、本物の substring
呼び出しを通すことに成功。

## 主要変更

### 1. MethodCall 構造追加 (34-6.1)
- `src/mir/join_ir/mod.rs`: JoinInst::MethodCall バリアント (+8 lines)
  - 構造: `{ dst, receiver, method, args }`
  - 設計原則: JoinIR は構造のみ、意味論は MIR レベル

### 2. extract_value 更新 (34-6.2)
- `src/mir/join_ir/frontend/ast_lowerer.rs`: Method 処理本物化 (+37 lines)
  - receiver/args を extract_value で再帰処理
  - ダミー Const(0) 削除 → 本物の MethodCall 生成
  - cond 処理修正: ValueId(0) ハードコード → extract_value で取得

### 3. JoinIR→MIR 変換実装 (34-6.3)
- `src/mir/join_ir_vm_bridge.rs`: MethodCall → BoxCall 変換 (+12 lines)
- `src/mir/join_ir/json.rs`: MethodCall JSON シリアライゼーション (+16 lines)
- `src/mir/join_ir_runner.rs`: MethodCall 未対応エラー (+7 lines)

### 4. テスト更新 (34-6.4)
- `docs/.../fixtures/json_shape_read_value.program.json`: 本物の substring 構造
- `src/tests/joinir_frontend_if_select.rs`: run_joinir_via_vm 使用
- テスト成功: v="hello", at=3 → "hel" 

## 成果

-  テスト全通過(1 passed; 0 failed)
-  設計原則確立: JoinIR = 構造 SSOT、意味論 = MIR レベル
-  Phase 33-10 原則との整合性: Method でも同じ原則適用

**ドキュメント更新**: CURRENT_TASK.md + TASKS.md(Phase 34-6 完了記録)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 17:05:46 +09:00
6a5701ead9 feat(joinir): Phase 34-4 & 34-5 — JoinIR Frontend Stage-1/meta 対応 & extract_value 汎用化
Phase 34-4: Stage-1/meta 実用関数対応
- 対象関数: JsonShapeToMap._read_value_from_pair/1
- フィクスチャ簡略化(Int 10/20 ダミー値)
- match 分岐に "_read_value_from_pair" 追加(1行変更)
- テスト追加: joinir_frontend_json_shape_read_value_ab_test
- DRY 原則維持(Phase 34-3 refactoring の完全勝利)

Phase 34-5: extract_value 汎用化 & 実用 if の意味論対応
- ExtractCtx 構造体追加(ValueId カウンタ + 変数名マップ)
- extract_value 実装(Int/Var/Method 対応)
- lower_if_return_pattern を extract_value ベースに統一
- extract_int_value 削除(重複コード削減)
- コメント更新(Phase 34-5 反映)

変更ファイル:
- src/mir/join_ir/frontend/ast_lowerer.rs: +248 -62 lines (ExtractCtx + extract_value)
- src/tests/joinir_frontend_if_select.rs: +66 lines (json_shape テスト)
- CURRENT_TASK.md: Phase 34-4 & 34-5 記録追加
- docs/private: Phase 34 ドキュメント追加(README/TASKS/fixtures)

テスト結果: 3 passed; 0 failed
- joinir_frontend_if_select_simple_ab_test (Phase 34-2)
- joinir_frontend_if_select_local_ab_test (Phase 34-3)
- joinir_frontend_json_shape_read_value_ab_test (Phase 34-4)

技術的成果:
- Int ダミー値 → 本物の式(Var)への段階的移行成功
- extract_value 統一により、今後の expr 拡張が容易に
- Method 呼び出し pattern match 実装(Phase 34-6 への準備完了)
- DRY 原則遵守(extract_int_value 削除、重複コード削減)

ガードレール完全遵守:
- Phase 34 frontend テスト専用(既定経路不変)
- JoinIR = PHI 生成器の原則維持
- 未対応パターンは panic(tiny テスト専用で合理的)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 16:31:06 +09:00
bb170a171e refactor(joinir): DRY principle - unify simple/local lowering
lower_simple_if と lower_local_if の重複コード(132行×2)を統合。

**変更内容**
- lower_simple_if → lower_if_return_pattern にリネーム
- lower_local_if を削除(完全に同じロジックのため)
- 関数名分岐を "test" | "local" に統合
- Phase 34-2/34-3 のコメント統一

**効果**
- コード削減: 340行 → 236行(31%削減)
- 保守性向上: 修正1箇所で済む
- 意図明確化: simple/local が同じパターンであることを型で表現

**技術的意義**
- DRY原則遵守: 重複コード完全排除
- 「値としての if」の統一: Select への正規化が1関数に集約
- Phase 34-4 への準備: パターン追加が容易な構造

テスト: 2 passed (simple + local) 

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 15:34:30 +09:00
66fecd3d14 feat(joinir): Phase 34-2/34-3 JoinIR Frontend implementation
AST→JoinIR フロントエンド経路の基盤完成。simple/local pattern で
「値としての if」が同じ JoinIR Select に正規化されることを実証。

**Phase 34-2: Simple pattern 実装**
- AstToJoinIrLowerer::lower_program_json() 実装
- Program(JSON v0) → JoinModule 変換パイプライン確立
- IfSelectTest.test: if cond { return 10 } else { return 20 }
- 変数ID衝突バグ修正(params分スキップ)

**Phase 34-3: Local pattern 対応**
- lower_simple_if/lower_local_if 関数分岐実装
- IfSelectTest.local: 意味論的 local pattern 対応
- simple と local で JoinIR 出力が同じことを実証

**技術的成果**
- JoinIR = 意味論の SSOT: 構文の違いを Select に統一
- PHI 不要の証明: 値としての if は Select のみで表現可能
- テスト: 2 passed (simple + local)

**実装ファイル**
- src/mir/join_ir/frontend/ast_lowerer.rs (340 lines)
- src/mir/join_ir/frontend/mod.rs (46 lines)
- src/tests/joinir_frontend_if_select.rs (140 lines)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 15:31:12 +09:00
9e9e08eb84 feat(joinir): Phase 33-9.1 Loop/If lowering responsibility separation
Implement clear separation between Loop and If lowering responsibilities:

**Guard Implementation:**
- Add is_loop_lowered_function() to identify 6 Loop-dedicated functions
- Exclude Loop functions from If lowering path in try_lower_if_to_joinir()
- Enforce "1 function → 1 lowering" principle

**Documentation:**
- Add responsibility comments to loop_to_join.rs
- Add responsibility comments to if_select.rs and if_merge.rs
- Update if_joinir_design.md with Phase 33-9.1 section

**Testing:**
- Add unit test test_is_loop_lowered_function() (PASS)
- Verify no regression in existing JoinIR tests

**Loop-dedicated functions (6):**
- Main.skip/1
- FuncScannerBox.trim/1
- FuncScannerBox.append_defs/2
- Stage1UsingResolverBox.resolve_for_source/5
- StageBBodyExtractorBox.build_body_src/2
- StageBFuncScannerBox.scan_all_boxes/1

This prevents future conflicts when both Loop and If lowering expand.

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 10:58:56 +09:00
517b20fe88 feat(joinir): Phase 33-8 Stage-1 rollout infrastructure
Add environment variable controls and debug logging for JoinIR lowering rollout.

Changes:
- Add HAKO_JOINIR_STAGE1 env var for Stage-1 function rollout control
- Add HAKO_JOINIR_DEBUG (0-3) for granular debug logging
  - Level 0: Silent (default)
  - Level 1: Basic lowering info
  - Level 2: Pattern matching details
  - Level 3: Full variable/instruction dump
- Implement 3-tier whitelist system:
  - Tier 1: Test functions (always enabled)
  - Tier 2: Stage-1 rollout (env-controlled)
  - Tier 3: Explicit approvals (validated in Phase 33-4)
- Add A/B test automation script (tools/joinir_ab_test.sh)
- Update if_merge.rs and if_select.rs with debug_level support

Environment variables (with NYASH_* fallback for compatibility):
- HAKO_JOINIR_IF_SELECT: Enable JoinIR lowering
- HAKO_JOINIR_STAGE1: Enable Stage-1 function rollout
- HAKO_JOINIR_DEBUG: Debug log level (0-3)

A/B test verification: PASSED on joinir_if_merge_{simple,multiple}.hako

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 09:30:54 +09:00
5b7818f5c9 feat(joinir): Phase 33-7 IfMerge lowering for multiple-variable PHI
Implements IfMerge instruction lowering to support multiple variables
merging from if/else branches (Phase 33-7: return pattern only).

## Changes

- Add src/mir/join_ir/lowering/if_merge.rs (232 lines)
  - IfMergeLowerer with pattern matching for common variables
  - extract_written_vars() / find_written_value() helpers
  - Phase 33-7 constraint: return pattern only (k_next=None)

- Update src/mir/join_ir/lowering/mod.rs
  - Unified entry point: try_lower_if_to_joinir()
  - Priority: IfMerge → Select → if_phi fallback
  - Add IfMergeTest.* to whitelist

- Add unit tests in src/tests/mir_joinir_if_select.rs
  - test_if_merge_simple_pattern (2 variables)
  - test_if_merge_multiple_pattern (3 variables)
  - All 7/7 tests PASS 

- Add reference test cases
  - apps/tests/joinir_if_merge_simple.hako (2-var pattern)
  - apps/tests/joinir_if_merge_multiple.hako (3-var pattern)

## Test Results

 Simple pattern (2 vars): merges=2, k_next=None
 Multiple pattern (3 vars): merges=3, k_next=None
 test result: ok. 7 passed; 0 failed

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 08:18:09 +09:00
2d379692e3 chore: Update docs/private submodule (Phase 33-5 docs) 2025-11-27 05:42:27 +09:00
2d30277e97 fix(joinir): Correct JsonShapeToMap function name and add Phase 33-5 test whitelist
Changes:
1. **Naming fix**: JsonShapeParser → JsonShapeToMap
   - Updated function name in whitelist to match actual static box name
   - Affected: JsonShapeToMap._read_value_from_pair/1 (lang/src/runtime/meta/json_shape_parser.hako)

2. **Phase 33-5 test whitelist**: Added Stage1JsonScannerTestBox.* pattern
   - Enables A/B testing for Stage-B if/else patterns
   - Test verified: Route A (if_phi) and Route B (Select) both RC=0 

Testing:
- Route A (NYASH_JOINIR_IF_SELECT=0): RC 0 ✓
- Route B (NYASH_JOINIR_IF_SELECT=1): RC 0 ✓
- Pattern: simple if/else return (Stage1JsonScannerBox.value_start_after_key_pos/2 style)

Phase 33-5: Stage-B if/Select A/B testing実施完了

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 05:39:29 +09:00
4fd013d9c7 Phase 33-5 preparation complete: Documentation updates
Submodule update: Phase 33 exit criteria & deletion roadmap documented

## Changes (docs/private)
- PHI_BOX_INVENTORY.md: Phase 33 progress section added
- phase-33-joinir-if-phi-cleanup/README.md: Exit criteria defined

## Key Points
- Deletion estimates: ~600 lines (if_phi, phi_invariants, conservative)
- Prerequisites: 5 conditions documented
- Stage-1/Stage-B application needed before full deletion
- Phase 33-4 complete, ready for Phase 33-5
2025-11-27 05:13:07 +09:00
c604402ea4 Phase 33-4.4 complete: Documentation + developer notes
## Documentation updates (docs/private submodule)
- TASKS.md: Phase 33-4.4 marked complete
- if_joinir_design.md: Section 10 added (A/B validation results)

## Developer convenience
- tools/smokes/v2/README.md: Added JoinIR If/Select smoke note
- One-liner for dev-only A/B verification (not CI-required)

Phase 33-4 fully complete. Next: Phase 33-5 preparation.
2025-11-27 05:05:01 +09:00
79cbf26f98 Phase 33-4: Stage-1/Stage-B expansion complete (33-4.1 to 33-4.3)
## Code Changes
- Extended function name whitelist in try_lower_if_to_joinir()
- Added: JsonShapeParser._read_value_from_pair/1 (Stage-1)
- Added: Stage1JsonScannerBox.value_start_after_key_pos/2 (Stage-B)

## Validation
- A/B testing: Route A (if_phi) vs Route B (Select) → identical results (RC 0)
- Test cases: joinir_if_select_simple.hako, joinir_if_select_local.hako
- Build: cargo build --release successful

## Documentation (docs/private submodule)
- TASKS.md: Phase 33-4.1 to 33-4.3 marked complete
- if_joinir_design.md: Section 9 added (candidate analysis)

## Next Steps
- Phase 33-4.4: CI/smoke test updates (pending)
2025-11-27 04:58:01 +09:00
bb4e3044a8 test(joinir): fix Phase 33-3.2 test flakiness by unifying env-dependent tests
Phase 33-3.2 test stabilization:
- Unified 4 env-dependent tests into 1 (test_if_select_pattern_matching)
- Eliminated race condition from parallel test execution
- All 5 tests now pass consistently (5/5 stable PASS)

Before: 8 tests (flaky 7-8/8 due to env var race)
After: 5 tests (stable 5/5, no flakiness)

Test coverage maintained:
- Simple pattern lowering (env ON)
- Local pattern lowering (env ON)
- Disabled by default (env OFF)
- Wrong function name filter (env ON)
- 4 verify tests (env-independent, kept separate)

Documentation:
- Updated TASKS.md with test flake resolution notes
- Updated docs/private submodule to 81ec67f

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 04:27:57 +09:00
4ba3fcd615 Phase 33-3.2: phi_invariants/conservative の JoinIR 側への移譲
実装内容:
- verify_select_minimal() 実装(Select 命令の最小 invariant チェック)
- phi_invariants.rs / conservative.rs のエッセンス抽出・移譲
- 4 テスト追加(simple/local with verify, reject multiple selects, check invariants)

移譲した責務:
- phi_invariants.rs::ensure_if_values_exist() → 型一貫性・完全性チェック
- conservative.rs::ConservativeMerge → 単一 PHI チェック

テスト結果:
-  8/8 tests PASS
-  simple/local パターン: Verifier PASS
-  不正パターン(複数 Select): Verifier REJECT
-  invariant ログ: conservative.rs / phi_invariants.rs からの移譲を明記

制限事項:
- IfSelectTest.* のみ対象、本線 if_phi は保持
- 削除は Stage-1/Stage-B/selfhost への適用後に行う

Phase 33-3.2 完了(2025-11-27)
2025-11-27 03:55:45 +09:00
10856bbb53 chore: Update docs/private submodule (Phase 33-3.1 docs) 2025-11-27 03:40:27 +09:00
f096a2a588 docs(phase33): Phase 33-3.1 - IfSelectTest.* JoinIR coverage documentation
Documentation update (code-unchanged):
- Add Phase 33-3.1 section to CURRENT_TASK.md
- Document JoinIR coverage range (simple/local patterns)
- Note constraints (dev-only, function name guard, mainline preserved)
- Document deletion plan (~600 lines: if_phi/phi_invariants/conservative)

Next steps: Phase 33-3.2 (JoinIR migration), Phase 33-3.3 (deletion)

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 03:39:09 +09:00
5cfb0e1d5b Phase 33-3: If/PHI MIR pattern matching + Select lowering (minimal patterns)
Implementation:
- Implement MIR pattern matching in if_select.rs (simple/local patterns)
- Add try_lower_if_to_joinir() entry point in lowering/mod.rs
- Create comprehensive integration tests (4/4 passing)

Pattern Support:
- Simple pattern: if cond { return 1 } else { return 2 }
  - Both blocks must have Return only (no instructions)
- Local pattern: if cond { x = a } else { x = b }; return x
  - Each branch has exactly 1 Copy instruction
  - Both branches jump to same merge block
  - Merge block Returns the assigned variable

Safety Mechanisms:
- Dev toggle: NYASH_JOINIR_IF_SELECT=1 required
- Function name filter: Only IfSelectTest.* functions
- Fallback: Returns None on pattern mismatch
- Zero breaking changes: Existing if_phi path untouched

Tests (4/4 PASS):
- test_if_select_simple_pattern
- test_if_select_local_pattern
- test_if_select_disabled_by_default
- test_if_select_wrong_function_name

Files:
- Modified: src/mir/join_ir/lowering/if_select.rs (pattern matching)
- Modified: src/mir/join_ir/lowering/mod.rs (entry point)
- New: src/tests/mir_joinir_if_select.rs (integration tests)
- Modified: src/tests/mod.rs (module registration)

Phase 33-3.2/3.3 (legacy removal) pending

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 03:28:32 +09:00
cbb9c0ade9 chore: Update docs/private submodule (Phase 33-0/1/2 docs) 2025-11-27 03:00:32 +09:00
35cd93a37a Phase 33-2: JoinInst::Select implementation + minimal If JoinIR lowering
Implementation:
- Add JoinInst::Select variant to JoinIR schema
- Implement Select execution in JoinIR Runner (Bool/Int cond support)
- Add Select handling in JoinIR→MIR Bridge (4-block structure)
- Create test cases (joinir_if_select_simple/local.hako)
- Add dev toggle NYASH_JOINIR_IF_SELECT=1
- Create lowering infrastructure (if_select.rs, stub for Phase 33-3)

Tests:
- 3/3 unit tests pass (test_select_true/false/int_cond)
- Integration tests pass (RC: 0)
- A/B execution verified (existing if_phi vs JoinIR Select)

Files changed:
- New: apps/tests/joinir_if_select_{simple,local}.hako
- New: src/mir/join_ir/lowering/if_select.rs
- Modified: src/mir/join_ir/{mod,json,runner,vm_bridge}.rs
- Modified: src/config/env.rs (joinir_if_select_enabled)
- Modified: docs/reference/environment-variables.md

Phase 33-3 ready: MIR pattern recognition + auto-lowering pending

🤖 Generated with Claude Code
Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-27 02:58:38 +09:00
0c252406ef docs(joinir): L-4.3b - Phase 40 role transfer documentation
## L-4.3b 完了内容

Phase 32 scope clarification:
- llvmlite harness JoinIR experiment (L-4.3a)  completed
- ny-llvmc JoinIR integration → deferred to Phase 40

## 方針明文化

**Phase 32 では**:
- ny-llvmc 側のコード変更なし
- JoinIR→MIR' 変換は Rust 本体 (llvm.rs) で実施
- ny-llvmc は「post-JoinIR MIR JSON」を受け取るだけ

**Phase 40 (LLVM Native Backend) で**:
- ny-llvmc 本体の最適化・native backend 化と併せて
- JoinIR 経路の統合を行う

## ドキュメント更新

- Phase 32 TASKS.md: L-4.3b 完了マーク + Phase 40 移管明記
- CURRENT_TASK.md: 1-00w セクション追加

関連: Phase 32 L-4.3a (llvmlite 実証完了)
2025-11-26 16:12:48 +09:00
b8893787dc feat(joinir): L-5.3 Phase 1 - progress carrier guard for generic_case_a
## 実装内容

1. has_safe_progress() helper 追加 (loop_to_join.rs:186-195)
   - Phase 1: scope.progress_carrier.is_some() をチェック (保守的)
   - Phase 2 (future): MirQuery で Add 命令チェック予定

2. is_supported_case_a_loop_view() に progress guard 追加 (256-266)
   - 無限ループの可能性があるループを事前にフォールバック
   - デバッグログで reject 理由を出力

## テスト結果

 25 passed; 0 failed - JoinIR 関連テスト全通過
 skip_ws / trim / append_defs / Stage‑1 UsingResolver 全ケース PASS
 既存テストへの影響なし

## 技術メモ

- 保守的アプローチ: progress_carrier.is_some() のみチェック
- LoopScopeShape で progress_carrier を carriers の先頭として設定済み
- ignored テスト失敗は MIR 自体の PHI バグで、本変更とは無関係 (git stash で確認済み)

関連: Phase 29 L-5.3 (TASKS.md), CURRENT_TASK.md 1-00v
2025-11-26 16:08:49 +09:00
bde83f311e docs(joinir): L-2.3 PHI問題のA/B実行実証
- CURRENT_TASK.md に L-2.3 進捗を追記
- docs/private サブモジュールに Phase 32 を追加

Route A vs Route B 比較結果:
- Route A (VM直接): Main.skip("   abc") → 0 (PHI バグ)
- Route B (JoinIR): Main.skip("   abc") → 3 (正解)

JoinIR が PHI 問題を設計的に解決していることを実行レベルで実証。

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 12:28:32 +09:00
ffd49ece91 docs(joinir): L-2.2 Step-5 - Verify Stage-B stability with generic ON
Verified NYASH_JOINIR_LOWER_GENERIC=1 does not break Stage-B:
- generic OFF: joinir_json 10 PASS, joinir_stageb 6 PASS
- generic ON: joinir_json 10 PASS, joinir_stageb 6 PASS,
  auto_lowering 2 PASS
- No guard additions needed - existing code is stable
- Stage-B execution remains on VM Route A (JoinIR as canary only)

L-2.2 is now fully complete (Step-1 through Step-5).

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 12:02:29 +09:00
eddc4e6035 docs(joinir): L-2.2 Step-4 - Update JoinIR VM bridge documentation
Phase 32 README:
- Expand VM Bridge table with "JoinIR 利用範囲" column
- Add L-2.2 progress summary table (Step-1~5 status)
- Add developer notes for Stage-B JoinIR observation

environment-variables.md:
- Add detailed descriptions for NYASH_JOINIR_* variables
- Clarify scope and limitations (Stage-B = lowering only)
- Add Stage-B JoinIR observation example

CURRENT_TASK:
- Update L-2.2 status to Step-1~4 complete

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 11:55:04 +09:00
1eea40454f test(joinir): L-2.2 Step-3 - Add Stage-B JoinIR→MIR structure tests
- Expose `convert_joinir_to_mir` as `pub(crate)` for test access
- Add `joinir_stageb_body_structure_test` and
  `joinir_stageb_funcscanner_structure_test` to `joinir_json_min.rs`
- Verify: JoinIR lowering succeeds, JoinIR→MIR conversion succeeds,
  function count matches, each function has >= 1 block
- Result: Both Stage-B functions produce 2 JoinIR functions
  (entry + loop_step) with appropriate block counts
- Note: Current tests verify handwritten JoinIR→MIR bridge layer,
  not full MIR→JoinIR roundtrip (future improvement)

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 11:38:45 +09:00
e61e7a2be6 feat(joinir): L-2.2 Step-2 - Add Stage-B to VM bridge dispatch
Add Stage-B BodyExtractor and FuncScanner to JoinIR VM bridge dispatch:
- Import stageb_body and stageb_funcscanner lowering functions
- Add routing for StageBBodyExtractorBox.build_body_src/2
- Add routing for StageBFuncScannerBox.scan_all_boxes/1
- Add try_run_stageb_body() and try_run_stageb_funcscanner() (lowering verification only)

Also cleanup unused imports in funcscanner_trim.rs and stage1_using_resolver.rs

Note: Stage-B functions use lowering verification pattern (like Stage-1)
because ArrayBox/MapBox args are not yet supported in JoinValue.

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 11:02:21 +09:00
9d769e9217 refactor(joinir): L-2.2 Step-1 - Unify Stage-B lowering via LoopToJoinLowerer
Stage-B minimal JoinIR lowering統一化:

1. Add Case-A helpers to loop_to_join.rs:
   - lower_case_a_for_stageb_body (StageBBodyExtractorBox.build_body_src/2)
   - lower_case_a_for_stageb_funcscanner (StageBFuncScannerBox.scan_all_boxes/1)

2. Update stageb_body.rs and stageb_funcscanner.rs:
   - Replace manual LoopForm construction with construct_simple_while_loopform
   - Route through LoopToJoinLowerer like other Case-A functions
   - Remove unused imports (LoopForm, MirQuery)

Now all 6 JoinIR lowering modules use the same unified pattern:
- skip_ws, trim, append_defs, stage1_resolver, stageb_body, stageb_funcscanner
All route through LoopToJoinLowerer for consistency.

Test results: JSON snapshot 6/6 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 10:47:35 +09:00
853cb36800 refactor(joinir): L-1.3 - Rename minimal helpers to Case-A helpers
LoopToJoinLowerer API cleanup:

1. Rename methods to reflect their purpose as Case-A helpers:
   - lower_minimal_skip_ws_case_a → lower_case_a_for_skip_ws
   - lower_minimal_trim_case_a → lower_case_a_for_trim
   - lower_minimal_append_defs_case_a → lower_case_a_for_append_defs
   - lower_minimal_stage1_case_a → lower_case_a_for_stage1_resolver

2. Update comments to clarify these are thin wrappers over `lower()`
   - "Case-A 汎用 lowerer の薄いラッパー"
   - Actual logic is centralized in `lower` method

3. Update all 4 call sites:
   - skip_ws.rs
   - funcscanner_trim.rs
   - funcscanner_append_defs.rs
   - stage1_using_resolver.rs

Test results: standalone (2/2), JSON snapshot (6/6) PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 10:28:03 +09:00
51ff558904 feat(phase32): L-2.1 Stage-1 UsingResolver JoinIR integration + cleanup
Phase 32 L-2.1 complete implementation:

1. Stage-1 UsingResolver main line JoinIR connection
   - CFG-based LoopForm construction for resolve_for_source/5
   - LoopToJoinLowerer integration with handwritten fallback
   - JSON snapshot tests 6/6 PASS

2. JoinIR/VM Bridge improvements
   - Simplified join_ir_vm_bridge.rs dispatch logic
   - Enhanced json.rs serialization
   - PHI core boxes cleanup (local_scope_inspector, loop_exit_liveness, loop_var_classifier)

3. Stage-1 CLI enhancements
   - Extended args.rs, groups.rs, mod.rs for new options
   - Improved stage1_bridge module (args, env, mod)
   - Updated stage1_cli.hako

4. MIR builder cleanup
   - Simplified if_form.rs control flow
   - Removed dead code from loop_builder.rs
   - Enhanced phi_merge.rs

5. Runner module updates
   - json_v0_bridge/lowering.rs improvements
   - dispatch.rs, selfhost.rs, modes/vm.rs cleanup

6. Documentation updates
   - CURRENT_TASK.md, AGENTS.md
   - Various docs/ updates

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 10:17:37 +09:00
7d0581c9a4 refactor(joinir): Extract construct_simple_while_loopform helper, delete legacy code
Phase 32 cleanup:

1. Delete legacy is_supported_case_a_loop function from loop_to_join.rs
   - Replaced by is_supported_case_a_loop_view() in Phase 32 Step 3

2. Extract construct_simple_while_loopform helper to common.rs
   - Unified LoopForm construction for simple while loops
   - Parameters: entry_is_preheader (trim=true, stage1=false)
                 has_break (trim=true, stage1=false)
   - Sets latch=body to satisfy is_simple_case_a_loop check

3. Update lowering modules to use the common helper:
   - funcscanner_trim.rs: entry_is_preheader=true, has_break=true
   - stage1_using_resolver.rs: entry_is_preheader=false, has_break=false

Test results: JSON snapshot 6/6 PASS, VM bridge trim 2/2 PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 10:15:31 +09:00
ec69b49446 feat(mir): Phase 32 Step 0-3B - LoopRegion/LoopControlShape view methods
Phase 32 introduces a "view pattern" for loop structures, enabling
gradual migration without breaking existing code.

Changes:
- control_form.rs: Add new ID types (LoopId, ExitEdgeId, ContinueEdgeId)
  and structures (LoopRegion, LoopControlShape, ExitEdge, ContinueEdge)
- control_form.rs: Add view methods on LoopShape:
  - to_region_view() - returns LoopRegion
  - to_control_view() - returns LoopControlShape
  - to_exit_edges() - returns Vec<ExitEdge>
  - to_continue_edges() - returns Vec<ContinueEdge>
- loop_scope_shape.rs: Use views in from_existing_boxes_legacy()
- loop_to_join.rs: Add debug logging with Phase 32 views

All 4 minimal lowerers (skip_ws/trim/append_defs/stage1) now use
view-based block ID extraction via shared from_existing_boxes_legacy().

Tests: joinir_runner_standalone_*, joinir_vm_bridge_trim_* PASS

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 08:01:32 +09:00
b35b477c9c feat(phase32): L-1 - Enable JoinIR by default for FuncScannerBox.trim/1
Phase 32 L-1: Make JoinIR the default execution path for verified targets.

- Added is_default_joinir_target() function to check default-enabled functions
- FuncScannerBox.trim/1 is now enabled by default (break=[], Case-A verified)
- Main.skip/1 excluded from default (break=[2], needs Case-B support)
- Environment variable NYASH_JOINIR_VM_BRIDGE=1 still works for other targets

Test results:
- trim: Route C (JoinIR) returns correct value "abc"
- trim: Route A (VM) returns "void" due to PHI bug
- JoinIR correctly handles PHI issues that affect direct VM path

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 06:23:07 +09:00
acffd9974b feat(phase31): Step 3-A/B - Add early return and structure checks to LoopToJoinLowerer
Phase 31 Step 3-A: Add early return using is_case_a_minimal_target() filter
- Check before LoopScopeShape construction for efficiency
- Returns None immediately for non-target functions

Phase 31 Step 3-B: Add structural validation to is_supported_case_a_loop()
- Single exit check: loop_form.break_targets.len() <= 1
- Variable presence check: !carriers.is_empty() || !pinned.is_empty()
- Debug logging for rejection reasons

Also refactored lower_with_scope() from if-else chain to match expression for clarity.

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

Co-Authored-By: Claude <noreply@anthropic.com>
2025-11-26 06:02:52 +09:00