Files
hakorune/src/mir/builder/control_flow/joinir/parity_checker.rs
nyash-codex d2972c1437 feat(joinir): Phase 92完了 - ConditionalStep + body-local変数サポート
## Phase 92全体の成果

**Phase 92 P0-P2**: ConditionalStep JoinIR生成とbody-local変数サポート
- ConditionalStep(条件付きキャリア更新)のJoinIR生成実装
- Body-local変数(ch等)の条件式での参照サポート
- 変数解決優先度: ConditionEnv → LoopBodyLocalEnv

**Phase 92 P3**: BodyLocalPolicyBox + 安全ガード
- BodyLocalPolicyDecision実装(Accept/Reject判定)
- BodyLocalSlot + DualValueRewriter(JoinIR/MIR二重書き込み)
- Fail-Fast契約(Cannot promote LoopBodyLocal検出)

**Phase 92 P4**: E2E固定+回帰最小化 (本コミット)
- Unit test 3本追加(body-local変数解決検証)
- Integration smoke追加(phase92_pattern2_baseline.sh、2ケースPASS)
- P4-E2E-PLAN.md、P4-COMPLETION.md作成

## 主要な実装

### ConditionalStep(条件付きキャリア更新)
- `conditional_step_emitter.rs`: JoinIR Select命令生成
- `loop_with_break_minimal.rs`: ConditionalStep検出と統合
- `loop_with_continue_minimal.rs`: Pattern4対応

### Body-local変数サポート
- `condition_lowerer.rs`: body-local変数解決機能
  - `lower_condition_to_joinir`: body_local_env パラメータ追加
  - 変数解決優先度実装(ConditionEnv優先)
  - Unit test 3本追加: 変数解決/優先度/エラー
- `header_break_lowering.rs`: break条件でbody-local変数参照
- 7ファイルで後方互換ラッパー(lower_condition_to_joinir_no_body_locals)

### Body-local Policy & Safety
- `body_local_policy.rs`: BodyLocalPolicyDecision(Accept/Reject)
- `body_local_slot.rs`: JoinIR/MIR二重書き込み
- `dual_value_rewriter.rs`: ValueId書き換えヘルパー

## テスト体制

### Unit Tests (+3)
- `test_body_local_variable_resolution`: body-local変数解決
- `test_variable_resolution_priority`: 変数解決優先度(ConditionEnv優先)
- `test_undefined_variable_error`: 未定義変数エラー
- 全7テストPASS(cargo test --release condition_lowerer::tests)

### Integration Smoke (+1)
- `phase92_pattern2_baseline.sh`:
  - Case A: loop_min_while.hako (Pattern2 baseline)
  - Case B: phase92_conditional_step_minimal.hako (条件付きインクリメント)
  - 両ケースPASS、integration profileで発見可能

### 退行確認
-  既存Pattern2Breakテスト正常(退行なし)
-  Phase 135 smoke正常(MIR検証PASS)

## アーキテクチャ設計

### 変数解決メカニズム
```rust
// Priority 1: ConditionEnv (loop params, captured)
if let Some(value_id) = env.get(name) { return Ok(value_id); }
// Priority 2: LoopBodyLocalEnv (body-local like `ch`)
if let Some(body_env) = body_local_env {
    if let Some(value_id) = body_env.get(name) { return Ok(value_id); }
}
```

### Fail-Fast契約
- Delta equality check (conditional_step_emitter.rs)
- Variable resolution error messages (ConditionEnv)
- Body-local promotion rejection (BodyLocalPolicyDecision::Reject)

## ドキュメント

- `P4-E2E-PLAN.md`: 3レベルテスト戦略(Level 1-2完了、Level 3延期)
- `P4-COMPLETION.md`: Phase 92完了報告
- `README.md`: Phase 92全体のまとめ

## 将来の拡張(Phase 92スコープ外)

- Body-local promotionシステム拡張
- P5bパターン認識の汎化(flagベース条件サポート)
- 完全なP5b E2Eテスト(body-local promotion実装後)

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

Co-Authored-By: Claude Sonnet 4.5 <noreply@anthropic.com>
2025-12-16 21:37:07 +09:00

278 lines
11 KiB
Rust

//! Router Parity Verification (Dev-only)
//!
//! Ensures the canonicalizer's pattern choice matches the router's pattern_kind.
//! This module provides validation to ensure consistency between the two systems.
use crate::ast::{ASTNode, Span};
use crate::mir::builder::MirBuilder;
impl MirBuilder {
/// Phase 137-4: Verify router parity between canonicalizer and router
///
/// Dev-only: Ensures the canonicalizer's pattern choice matches the router's
/// pattern_kind. On mismatch:
/// - Debug mode (HAKO_JOINIR_DEBUG=1): Log warning
/// - Strict mode (HAKO_JOINIR_STRICT=1 or NYASH_JOINIR_STRICT=1): Return error
///
/// Phase 92 P0-2: Now returns (Result<(), String>, Option<LoopSkeleton>)
/// The skeleton can be used by Pattern2 lowerer for ConditionalStep handling.
pub(super) fn verify_router_parity(
&self,
condition: &ASTNode,
body: &[ASTNode],
func_name: &str,
ctx: &super::patterns::LoopPatternContext,
) -> (Result<(), String>, Option<crate::mir::loop_canonicalizer::LoopSkeleton>) {
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
// Reconstruct loop AST for canonicalizer
let loop_ast = ASTNode::Loop {
condition: Box::new(condition.clone()),
body: body.to_vec(),
span: Span::unknown(),
};
// Run canonicalizer
let (skeleton, decision) = match canonicalize_loop_expr(&loop_ast) {
Ok((skel, dec)) => (Some(skel), dec),
Err(e) => {
let err_msg = format!("[loop_canonicalizer/PARITY] Canonicalizer error: {}", e);
return (Err(err_msg), None);
}
};
// Compare patterns only if canonicalizer succeeded
let result = if let Some(canonical_pattern) = decision.chosen {
let actual_pattern = ctx.pattern_kind;
if canonical_pattern != actual_pattern {
// Pattern mismatch detected
let msg = format!(
"[loop_canonicalizer/PARITY] MISMATCH in function '{}': \
canonical={:?}, actual={:?}",
func_name, canonical_pattern, actual_pattern
);
// Phase 138-P2-B: Use SSOT for environment variable check
use crate::config::env::joinir_dev;
let is_strict = joinir_dev::strict_enabled();
if is_strict {
// Strict mode: fail fast
Err(msg)
} else {
// Debug mode: log only
super::trace::trace().dev("loop_canonicalizer/parity", &msg);
Ok(())
}
} else {
// Patterns match - success!
super::trace::trace().dev(
"loop_canonicalizer/parity",
&format!(
"[loop_canonicalizer/PARITY] OK in function '{}': canonical and actual agree on {:?}",
func_name, canonical_pattern
),
);
Ok(())
}
} else {
// Canonicalizer failed (Fail-Fast)
// Log but don't error - router might still handle it
super::trace::trace().dev(
"loop_canonicalizer/parity",
&format!(
"[loop_canonicalizer/PARITY] Canonicalizer failed for '{}': {}",
func_name,
decision.notes.join("; ")
),
);
Ok(())
};
// Phase 92 P0-2: Return both parity result and skeleton
(result, skeleton)
}
}
#[cfg(test)]
mod tests {
use super::*;
use crate::ast::{ASTNode, BinaryOperator, LiteralValue, Span};
/// Test helper: Create a skip_whitespace pattern loop AST
fn build_skip_whitespace_loop() -> ASTNode {
ASTNode::Loop {
condition: Box::new(ASTNode::BinaryOp {
operator: BinaryOperator::Less,
left: Box::new(ASTNode::Variable {
name: "p".to_string(),
span: Span::unknown(),
}),
right: Box::new(ASTNode::Variable {
name: "len".to_string(),
span: Span::unknown(),
}),
span: Span::unknown(),
}),
body: vec![ASTNode::If {
condition: Box::new(ASTNode::BinaryOp {
operator: BinaryOperator::Equal,
left: Box::new(ASTNode::Variable {
name: "is_ws".to_string(),
span: Span::unknown(),
}),
right: Box::new(ASTNode::Literal {
value: LiteralValue::Integer(1),
span: Span::unknown(),
}),
span: Span::unknown(),
}),
then_body: vec![ASTNode::Assignment {
target: Box::new(ASTNode::Variable {
name: "p".to_string(),
span: Span::unknown(),
}),
value: Box::new(ASTNode::BinaryOp {
operator: BinaryOperator::Add,
left: Box::new(ASTNode::Variable {
name: "p".to_string(),
span: Span::unknown(),
}),
right: Box::new(ASTNode::Literal {
value: LiteralValue::Integer(1),
span: Span::unknown(),
}),
span: Span::unknown(),
}),
span: Span::unknown(),
}],
else_body: Some(vec![ASTNode::Break {
span: Span::unknown(),
}]),
span: Span::unknown(),
}],
span: Span::unknown(),
}
}
#[test]
fn test_parity_check_skip_whitespace_match() {
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
let loop_ast = build_skip_whitespace_loop();
// Extract condition and body
let (condition, body) = match &loop_ast {
ASTNode::Loop {
condition, body, ..
} => (condition.as_ref(), body.as_slice()),
_ => panic!("Expected loop node"),
};
// Run canonicalizer
let (_, canonical_decision) = canonicalize_loop_expr(&loop_ast).unwrap();
let canonical_pattern = canonical_decision
.chosen
.expect("Canonicalizer should succeed");
// Run router's pattern detection
let has_continue = ast_features::detect_continue_in_body(body);
let has_break = ast_features::detect_break_in_body(body);
let features = ast_features::extract_features(condition, body, has_continue, has_break);
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
// Phase 137-5: Verify MATCH (ExitContract policy fix)
// Both canonicalizer and router should agree on Pattern2Break
// because has_break=true (ExitContract determines pattern choice)
assert_eq!(
canonical_pattern,
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
"Canonicalizer should choose Pattern2Break for has_break=true"
);
assert_eq!(
actual_pattern,
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern2Break,
"Router should classify as Pattern2Break for has_break=true"
);
assert_eq!(
canonical_pattern, actual_pattern,
"Phase 137-5: Canonicalizer and router should agree (SSOT policy)"
);
}
#[test]
fn test_parity_check_match_simple_while() {
use crate::mir::builder::control_flow::joinir::patterns::ast_feature_extractor as ast_features;
use crate::mir::loop_canonicalizer::canonicalize_loop_expr;
// Simple while loop: no break, no continue, no if
let loop_ast = ASTNode::Loop {
condition: Box::new(ASTNode::BinaryOp {
operator: BinaryOperator::Less,
left: Box::new(ASTNode::Variable {
name: "i".to_string(),
span: Span::unknown(),
}),
right: Box::new(ASTNode::Literal {
value: LiteralValue::Integer(10),
span: Span::unknown(),
}),
span: Span::unknown(),
}),
body: vec![ASTNode::Assignment {
target: Box::new(ASTNode::Variable {
name: "i".to_string(),
span: Span::unknown(),
}),
value: Box::new(ASTNode::BinaryOp {
operator: BinaryOperator::Add,
left: Box::new(ASTNode::Variable {
name: "i".to_string(),
span: Span::unknown(),
}),
right: Box::new(ASTNode::Literal {
value: LiteralValue::Integer(1),
span: Span::unknown(),
}),
span: Span::unknown(),
}),
span: Span::unknown(),
}],
span: Span::unknown(),
};
// Extract condition and body
let (condition, body) = match &loop_ast {
ASTNode::Loop {
condition, body, ..
} => (condition.as_ref(), body.as_slice()),
_ => panic!("Expected loop node"),
};
// Canonicalizer will fail for simple patterns (not yet implemented)
let canonical_result = canonicalize_loop_expr(&loop_ast);
// Router's pattern detection
let has_continue = ast_features::detect_continue_in_body(body);
let has_break = ast_features::detect_break_in_body(body);
let features = ast_features::extract_features(condition, body, has_continue, has_break);
let actual_pattern = crate::mir::loop_pattern_detection::classify(&features);
// Router should classify as Pattern1SimpleWhile
assert_eq!(
actual_pattern,
crate::mir::loop_pattern_detection::LoopPatternKind::Pattern1SimpleWhile
);
// Canonicalizer should fail (not implemented yet for Pattern1)
assert!(canonical_result.is_ok());
let (_, decision) = canonical_result.unwrap();
assert!(
decision.is_fail_fast(),
"Canonicalizer should fail for simple patterns (Phase 3 only supports skip_whitespace)"
);
}
}