🎯 builder_calls.rs (982行) を箱理論で責務別にモジュール分割 ## 成果 ✅ builder_calls.rs: 982行 → 766行(-216行、22%削減) ✅ calls/lowering.rs: 354行(新規、箱理論6段階パターン) ✅ calls/utils.rs: 45行(新規、ユーティリティ統一) ✅ ビルド・テスト完全成功(0エラー) ## 箱理論の実装 1. 責務ごとに箱に分離: - lowering: 関数lowering専用 - utils: ユーティリティ統一 - emit/build: Phase 2で実装予定 2. 境界を明確に: - mod.rs で公開インターフェース定義 - pub(in crate::mir::builder) で適切な可視性制御 3. いつでも戻せる: - 段階的移行、各ステップでビルド確認 - 既存API完全保持(互換性100%) 4. 巨大関数は分割: - lower_static_method_as_function: 125行 → 6段階に分解 - lower_method_as_function: 80行 → 6段階に分解 ## 箱理論6段階パターン 1. prepare_lowering_context - Context準備 2. create_function_skeleton - 関数スケルトン作成 3. setup_function_params - パラメータ設定 4. lower_function_body - 本体lowering 5. finalize_function - 関数finalize 6. restore_lowering_context - Context復元 ## ファイル構成 src/mir/builder/ ├── calls/ │ ├── mod.rs # 公開インターフェース │ ├── lowering.rs # 関数lowering(354行) │ └── utils.rs # ユーティリティ(45行) └── builder_calls.rs # 削減版(766行) ## 次のステップ Phase 2: emit.rs 作成(~500行移行) Phase 3: build.rs 作成(~350行移行) 最終目標: builder_calls.rs を200行以内に 🤖 Generated with [Claude Code](https://claude.com/claude-code) Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: Task先生 <task@anthropic.com>
151 lines
5.1 KiB
Rust
151 lines
5.1 KiB
Rust
/*!
|
|
* Loop Builder Facade (Minimal API)
|
|
*
|
|
* Goal: Decouple loop construction from concrete MirBuilder types by exposing
|
|
* a small trait that both legacy (mir::builder::MirBuilder) and modularized
|
|
* builders can implement. This enables shared helpers and gradual migration.
|
|
*
|
|
* Note: Only legacy MirBuilder is wired for now to keep WIP modularized code
|
|
* out of the main build. The modularized builder can implement this trait
|
|
* later without changing callers.
|
|
*/
|
|
|
|
use super::{BasicBlockId, MirInstruction, ValueId};
|
|
|
|
/// Minimal API for constructing loops and emitting instructions
|
|
pub trait LoopBuilderApi {
|
|
/// Allocate a new basic block id
|
|
fn new_block(&mut self) -> BasicBlockId;
|
|
/// Get current block id
|
|
fn current_block(&self) -> Result<BasicBlockId, String>;
|
|
/// Switch current block, creating it if needed
|
|
fn start_new_block(&mut self, block: BasicBlockId) -> Result<(), String>;
|
|
/// Emit an instruction to the current block
|
|
fn emit(&mut self, inst: MirInstruction) -> Result<(), String>;
|
|
/// Allocate a new SSA value id
|
|
fn new_value(&mut self) -> ValueId;
|
|
|
|
/// Add predecessor edge to a block (CFG maintenance)
|
|
fn add_predecessor(&mut self, _block: BasicBlockId, _pred: BasicBlockId) -> Result<(), String> {
|
|
Err("add_predecessor not implemented".into())
|
|
}
|
|
/// Seal a block when all predecessors are known
|
|
fn seal_block(&mut self, _block: BasicBlockId) -> Result<(), String> {
|
|
Err("seal_block not implemented".into())
|
|
}
|
|
/// Insert a phi at block start
|
|
fn insert_phi_at_block_start(
|
|
&mut self,
|
|
_block: BasicBlockId,
|
|
_dst: ValueId,
|
|
_inputs: Vec<(BasicBlockId, ValueId)>,
|
|
) -> Result<(), String> {
|
|
Err("insert_phi_at_block_start not implemented".into())
|
|
}
|
|
}
|
|
|
|
/// Helper: simplified loop lowering usable by any LoopBuilderApi implementor
|
|
pub fn build_simple_loop<L: LoopBuilderApi>(
|
|
lb: &mut L,
|
|
condition: ValueId,
|
|
build_body: &mut dyn FnMut(&mut L) -> Result<(), String>,
|
|
) -> Result<ValueId, String> {
|
|
let header = lb.new_block();
|
|
let body = lb.new_block();
|
|
let after = lb.new_block();
|
|
|
|
// Jump to header
|
|
lb.emit(MirInstruction::Jump { target: header })?;
|
|
|
|
// Header: branch on provided condition
|
|
lb.start_new_block(header)?;
|
|
lb.emit(MirInstruction::Branch {
|
|
condition,
|
|
then_bb: body,
|
|
else_bb: after,
|
|
})?;
|
|
|
|
// Body
|
|
lb.start_new_block(body)?;
|
|
build_body(lb)?;
|
|
lb.emit(MirInstruction::Jump { target: header })?;
|
|
|
|
// After: return void value
|
|
lb.start_new_block(after)?;
|
|
let void_id = lb.new_value();
|
|
lb.emit(MirInstruction::Const {
|
|
dst: void_id,
|
|
value: crate::mir::ConstValue::Void,
|
|
})?;
|
|
Ok(void_id)
|
|
}
|
|
|
|
// === Legacy wiring: implement LoopBuilderApi for mir::builder::MirBuilder ===
|
|
impl LoopBuilderApi for super::builder::MirBuilder {
|
|
fn new_block(&mut self) -> BasicBlockId {
|
|
self.block_gen.next()
|
|
}
|
|
fn current_block(&self) -> Result<BasicBlockId, String> {
|
|
self.current_block
|
|
.ok_or_else(|| "No current block".to_string())
|
|
}
|
|
fn start_new_block(&mut self, block: BasicBlockId) -> Result<(), String> {
|
|
super::builder::MirBuilder::start_new_block(self, block)
|
|
}
|
|
fn emit(&mut self, inst: MirInstruction) -> Result<(), String> {
|
|
super::builder::MirBuilder::emit_instruction(self, inst)
|
|
}
|
|
fn new_value(&mut self) -> ValueId {
|
|
// Use function-local allocator to avoid colliding with existing
|
|
// ValueIds in the current function.
|
|
self.next_value_id()
|
|
}
|
|
|
|
fn add_predecessor(&mut self, block: BasicBlockId, pred: BasicBlockId) -> Result<(), String> {
|
|
if let Some(ref mut f) = self.current_function {
|
|
if let Some(bb) = f.get_block_mut(block) {
|
|
bb.add_predecessor(pred);
|
|
Ok(())
|
|
} else {
|
|
Err(format!("Block {} not found", block.as_u32()))
|
|
}
|
|
} else {
|
|
Err("No current function".into())
|
|
}
|
|
}
|
|
|
|
fn seal_block(&mut self, block: BasicBlockId) -> Result<(), String> {
|
|
if let Some(ref mut f) = self.current_function {
|
|
if let Some(bb) = f.get_block_mut(block) {
|
|
bb.seal();
|
|
Ok(())
|
|
} else {
|
|
Err(format!("Block {} not found", block.as_u32()))
|
|
}
|
|
} else {
|
|
Err("No current function".into())
|
|
}
|
|
}
|
|
|
|
fn insert_phi_at_block_start(
|
|
&mut self,
|
|
block: BasicBlockId,
|
|
dst: ValueId,
|
|
inputs: Vec<(BasicBlockId, ValueId)>,
|
|
) -> Result<(), String> {
|
|
if let Some(ref mut f) = self.current_function {
|
|
if let Some(bb) = f.get_block_mut(block) {
|
|
let inst = MirInstruction::Phi { dst, inputs };
|
|
// Update effect mask and insert at the very start
|
|
bb.effects = bb.effects | inst.effects();
|
|
bb.instructions.insert(0, inst);
|
|
Ok(())
|
|
} else {
|
|
Err(format!("Block {} not found", block.as_u32()))
|
|
}
|
|
} else {
|
|
Err("No current function".into())
|
|
}
|
|
}
|
|
}
|