refactor(plan): Phase 273 P3+ - Legacy code removal
Phase 273 P3+ 完成: レガシーコード削除 + 未使用 import 整理 Removed Legacy Items: 1. emit_scan_with_init_edgecfg() - Pattern6 固有の emission 関数 - File deleted: src/mir/builder/emission/loop_scan_with_init.rs (~144 lines) - Replaced by: generalized Frag API (Phase 273 P2) 2. CoreCarrierInfo struct - Legacy carrier representation - Removed from: src/mir/builder/control_flow/plan/mod.rs (~15 lines) - Replaced by: CorePhiInfo (generalized PHI representation) 3. verify_carrier() function - CoreCarrierInfo validator - Removed from: src/mir/builder/control_flow/plan/verifier.rs (~15 lines) - Replaced by: generalized PHI verification (V7-V9) Code Cleanup: - cargo fix applied: unused imports removed (~30 files) - Verifier invariants updated: V1→V2-V9 (carrier→PHI model) - Module declaration cleanup in emission/mod.rs Impact: - Total lines removed: ~174 lines (net reduction) - Pattern-agnostic architecture strengthened - All legacy Pattern6 references eliminated Tests: - ✅ VM tests PASS (phase254/256/258) - ✅ LLVM tests PASS (phase256/258) 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
@ -1,143 +0,0 @@
|
||||
//! Phase 272 P0.1: Pattern6 Scan with Init - Emission Entrypoint
|
||||
//!
|
||||
//! ## Purpose
|
||||
//! Thin entrypoint for Pattern6 Frag construction and MIR terminator emission.
|
||||
//! This module only handles terminator wiring via EdgeCFG Frag API.
|
||||
//! Block allocation and value computation (len, substring, match check) are done by Pattern6.
|
||||
//!
|
||||
//! ## Pattern Structure
|
||||
//! ```nyash
|
||||
//! index_of(s, ch) {
|
||||
//! local i = 0
|
||||
//! loop(i < s.length()) {
|
||||
//! if s.substring(i, i + 1) == ch {
|
||||
//! return i
|
||||
//! }
|
||||
//! i = i + 1
|
||||
//! }
|
||||
//! return -1
|
||||
//! }
|
||||
//! ```
|
||||
//!
|
||||
//! ## P0 Scope
|
||||
//! - Forward scan only (step = 1)
|
||||
//! - Fixed needle (ch)
|
||||
//! - No ret_not_found_bb (after_bb handles AST return -1)
|
||||
//!
|
||||
//! ## Critical SSOT
|
||||
//! 1. Return in wires (not exits) - emit_frag() generates terminators from wires/branches only
|
||||
//! 2. after_bb has no terminator - let subsequent AST lowering handle "return -1"
|
||||
//! 3. Frag assembly is direct field access (no with_* API)
|
||||
//! 4. BranchStub/EdgeStub field names match current implementation
|
||||
//! 5. Return Void (loop as statement, not expression)
|
||||
|
||||
use crate::mir::builder::MirBuilder;
|
||||
use crate::mir::builder::control_flow::edgecfg::api::{
|
||||
BranchStub, EdgeStub, ExitKind, Frag, emit_frag,
|
||||
};
|
||||
use crate::mir::basic_block::{BasicBlockId, EdgeArgs};
|
||||
use crate::mir::join_ir::lowering::inline_boundary::JumpArgsLayout;
|
||||
use crate::mir::ValueId;
|
||||
|
||||
/// Emit Scan with Init EdgeCFG Fragment
|
||||
///
|
||||
/// ## Arguments
|
||||
/// - `b`: MirBuilder (for emit_frag access to current_function)
|
||||
/// - `header_bb`: Loop condition check block (i < s.length())
|
||||
/// - `body_bb`: Substring + match check + early return branch
|
||||
/// - `step_bb`: Increment i and jump back to header
|
||||
/// - `after_bb`: Normal loop exit (no terminator - subsequent AST lowering handles "return -1")
|
||||
/// - `ret_found_bb`: Early exit Return(i) block
|
||||
/// - `cond_loop`: ValueId for (i < s.length())
|
||||
/// - `cond_match`: ValueId for (ch == needle)
|
||||
/// - `i_found`: ValueId for loop variable i (return value for found case)
|
||||
///
|
||||
/// ## Frag Structure
|
||||
/// - **branches**:
|
||||
/// 1. header: cond_loop true→body, false→after
|
||||
/// 2. body: cond_match true→ret_found, false→step
|
||||
/// - **wires**:
|
||||
/// - step → header (Normal Jump)
|
||||
/// - ret_found_bb → Return(i) - **IN WIRES, NOT EXITS**
|
||||
/// - **exits**: empty (no upward propagation in P0)
|
||||
///
|
||||
/// ## Returns
|
||||
/// `Ok(())` - Frag emitted successfully
|
||||
/// `Err` - emit_frag failed or current_function is None
|
||||
pub(in crate::mir::builder) fn emit_scan_with_init_edgecfg(
|
||||
b: &mut MirBuilder,
|
||||
header_bb: BasicBlockId,
|
||||
body_bb: BasicBlockId,
|
||||
step_bb: BasicBlockId,
|
||||
after_bb: BasicBlockId,
|
||||
ret_found_bb: BasicBlockId,
|
||||
cond_loop: ValueId,
|
||||
cond_match: ValueId,
|
||||
i_found: ValueId,
|
||||
) -> Result<(), String> {
|
||||
// EdgeArgs::empty() helper
|
||||
let empty_args = EdgeArgs {
|
||||
layout: JumpArgsLayout::CarriersOnly,
|
||||
values: vec![],
|
||||
};
|
||||
|
||||
// Return(i) arguments (contains found index)
|
||||
let ret_found_args = EdgeArgs {
|
||||
layout: JumpArgsLayout::CarriersOnly,
|
||||
values: vec![i_found],
|
||||
};
|
||||
|
||||
// branches (BranchStub) - current field names
|
||||
let branches = vec![
|
||||
BranchStub {
|
||||
from: header_bb,
|
||||
cond: cond_loop,
|
||||
then_target: body_bb,
|
||||
then_args: empty_args.clone(),
|
||||
else_target: after_bb,
|
||||
else_args: empty_args.clone(),
|
||||
},
|
||||
BranchStub {
|
||||
from: body_bb,
|
||||
cond: cond_match,
|
||||
then_target: ret_found_bb,
|
||||
then_args: empty_args.clone(),
|
||||
else_target: step_bb,
|
||||
else_args: empty_args.clone(),
|
||||
},
|
||||
];
|
||||
|
||||
// wires (EdgeStub) - current field names
|
||||
let wires = vec![
|
||||
// step_bb → header_bb Jump (Normal)
|
||||
EdgeStub {
|
||||
from: step_bb,
|
||||
kind: ExitKind::Normal,
|
||||
target: Some(header_bb),
|
||||
args: empty_args,
|
||||
},
|
||||
// ret_found_bb Return(i) - THIS GOES IN WIRES!
|
||||
EdgeStub {
|
||||
from: ret_found_bb,
|
||||
kind: ExitKind::Return,
|
||||
target: None,
|
||||
args: ret_found_args,
|
||||
},
|
||||
// P0: No ret_not_found wire - after_bb handles AST return -1
|
||||
];
|
||||
|
||||
// Frag assembly (direct field access - no with_* API exists)
|
||||
let mut frag = Frag::new(header_bb);
|
||||
frag.branches = branches;
|
||||
frag.wires = wires;
|
||||
// exits is empty (no upward propagation in P0)
|
||||
|
||||
// emit_frag generates MIR terminators
|
||||
if let Some(ref mut func) = b.scope_ctx.current_function {
|
||||
emit_frag(func, &frag)?;
|
||||
} else {
|
||||
return Err("[emit_scan_with_init_edgecfg] current_function is None".to_string());
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
@ -4,13 +4,13 @@
|
||||
//! - branch.rs: Branch/Jump 発行の薄い関数
|
||||
//! - phi.rs: PHI挿入の薄いラッパー（builder context extraction）
|
||||
//! - loop_predicate_scan.rs: Pattern8 bool predicate scan EdgeCFG Frag (Phase 269 P1)
|
||||
//! - loop_scan_with_init.rs: Pattern6 scan with init EdgeCFG Frag (Phase 272 P0.1)
|
||||
//! - loop_split_scan.rs: Pattern7 split scan EdgeCFG Frag (Phase 272 P0.2)
|
||||
//!
|
||||
//! Phase 273 P3: loop_scan_with_init.rs removed (replaced by generalized Frag API)
|
||||
|
||||
pub mod branch;
|
||||
pub mod compare;
|
||||
pub mod constant;
|
||||
pub(in crate::mir::builder) mod phi; // Phase 272 P0.2 Refactoring
|
||||
pub(in crate::mir::builder) mod loop_predicate_scan; // Phase 269 P1
|
||||
pub(in crate::mir::builder) mod loop_scan_with_init; // Phase 272 P0.1
|
||||
pub(in crate::mir::builder) mod loop_split_scan; // Phase 272 P0.2
|
||||
|
||||
Reference in New Issue
Block a user