Files

tomoaki 661bbe1ab7 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

README.md

Hakorune Smoke Tests v2 — Guide (Nyash-compatible)

Overview

Entry: tools/smokes/v2/run.sh — unified runner for quick/integration/full.
Profiles:
- quick — fast developer checks.
- integration — VM↔LLVM parity, basic stability.
- full — comprehensive matrix.

🎯 Two Baselines (Runbook)

これから開発の基準となる2つのベースライン：

📦 VM ライン（Rust VM - 既定）

用途: 開発・デバッグ・検証用（高速・型安全）

# ビルド
cargo build --release

# 一括スモークテスト
tools/smokes/v2/run.sh --profile quick

# 個別スモークテスト
tools/smokes/v2/run.sh --profile quick --filter "<glob>"
# 例: --filter "core/json_query_min_vm.sh"

# 単発実行（参考）
$NYASH_BIN --backend vm apps/APP/main.hako

⚡ llvmlite ライン（LLVMハーネス）

用途: 本番・最適化・配布用（実証済み安定性）

前提: Python3 + llvmlite

pip install llvmlite  # 未導入の場合

実行手順:

# ビルド（LLVM_SYS_180_PREFIX不要！）
cargo build --release --features llvm

# 一括スモークテスト
tools/smokes/v2/run.sh --profile integration

# 個別スモークテスト
tools/smokes/v2/run.sh --profile integration --filter "<glob>"

# 単発実行
NYASH_LLVM_USE_HARNESS=1 $NYASH_BIN --backend llvm apps/tests/peek_expr_block.hako

# 有効化確認
$NYASH_BIN --version | rg -i 'features.*llvm'

💡 重要: 両方のラインのテストが通ることで、MIR14統一アーキテクチャの品質を保証！

🔁 QuickでAST/LLVM系も実行したいとき

通常、quick は LLVM未ビルド時に AST/LLVM系テストを自動で SKIP します。 Quickでも実行したい場合は、先に LLVM 有効でビルドしてください：

LLVM_SYS_180_PREFIX=$(llvm-config-18 --prefix) cargo build --release --features llvm
tools/smokes/v2/run.sh --profile quick

テストランナーは LLVM 非対応時にヒントを出力します（buildコマンドの案内）。

Notes

Using resolution: prefer nyash.toml aliases (SSOT). Some tests may enable NYASH_ALLOW_USING_FILE=1 internally for convenience.
Plugin warnings are informational; smokes are designed to pass without dynamic plugins.
Harness single-run may take longer due to link+exec; integration profile includes generous timeouts.
Binary selection in scripts: always use $NYASH_BIN (the runner sets it to target/release/hakorune when present, otherwise falls back to nyash).
Branding: user‑visible messages prefer “Hakorune”; the legacy nyash binary remains for compatibility but may be gated（HAKO_ALLOW_NYASH=1）。

Dev Mode (defaults)

In v2 smokes, the quick profile exports NYASH_DEV=1 by default.
- This enables CLI --dev-equivalent defaults inside Nyash:
  - AST using ON (SSOT + AST prelude merge)
  - Operator Boxes in observe mode (no adoption)
  - Minimal diagnostics; output parity is preserved
You can also run manually with nyash --dev script.hako.

Common commands

Quick suite (auto NYASH_DEV=1):
- tools/smokes/v2/run.sh --profile quick
Focus JSON smokes:
- tools/opbox-json.sh (Roundtrip/Nested, plugins disabled, generous timeout)
One-off program (VM):
- $NYASH_BIN --backend vm --dev apps/APP/main.hako

Key env knobs

NYASH_DEV=1 — enable dev defaults (same effect as --dev).
SMOKES_DEFAULT_TIMEOUT — per test timeout seconds (default 15 for quick).
SMOKES_PLUGIN_MODE=dynamic|static — plugin mode for preflight (auto by default).
SMOKES_FORCE_CONFIG=rust_vm_dynamic|llvm_static — force backend config.
SMOKES_NOTIFY_TAIL — lines to show on failure tail (default 80).