docs(llvm/vm): 静的Box(self)規約を明文化 + Bridgeトグル追記; Gate‑C/Core 現状反映; CURRENT_TASK 更新。\n\n- 新規: docs/development/architecture/llvm/static_box_singleton.md\n- 追記: lang/src/vm/README.md に self 先頭規約/互換トグルを明記\n- 追記: CURRENT_TASK に本更新を記録\n- phase-20.33/CHECKLIST にドキュメント完了チェックを追加\n- bak フォルダはリポジトリ直下に存在せず(削除対象なし)\n\n併せて未コミット差分をスナップショット(Rust 層の前作業含む)

This commit is contained in:
nyash-codex
2025-11-01 16:31:48 +09:00
parent b9340a1b19
commit 01b4417c5d
7 changed files with 156 additions and 9 deletions

View File

@ -31,7 +31,14 @@ impl super::MirBuilder {
if let ASTNode::FunctionDeclaration { params, body, .. } = main_method {
// Also materialize a callable function entry "BoxName.main/N" for harness/PyVM
let func_name = format!("{}.{}", box_name, "main");
eprintln!("[DEBUG] build_static_main_box: Before lower_static_method_as_function");
eprintln!("[DEBUG] variable_map = {:?}", self.variable_map);
let _ = self.lower_static_method_as_function(func_name, params.clone(), body.clone());
eprintln!("[DEBUG] build_static_main_box: After lower_static_method_as_function");
eprintln!("[DEBUG] variable_map = {:?}", self.variable_map);
// ✅ PHI UseBeforeDef修正: 関数生成後、変数マップをクリア
// 理由: cf_block()で同じbodyを再処理する際、前の関数の変数PHI ID等が混入するのを防ぐ
self.variable_map.clear();
// Convert the method body to a Program AST node and lower it
let program_ast = ASTNode::Program {
statements: body.clone(),

View File

@ -306,7 +306,15 @@ impl<'a> LoopBuilder<'a> {
header_id: BasicBlockId,
preheader_id: BasicBlockId,
) -> Result<(), String> {
use std::sync::atomic::{AtomicUsize, Ordering};
static CALL_COUNT: AtomicUsize = AtomicUsize::new(0);
let count = CALL_COUNT.fetch_add(1, Ordering::SeqCst);
let current_vars = self.get_current_variable_map();
// Debug: print current_vars before prepare
eprintln!("[DEBUG] prepare_loop_variables call #{}", count);
eprintln!("[DEBUG] current_vars = {:?}", current_vars);
eprintln!("[DEBUG] preheader_id = {:?}, header_id = {:?}", preheader_id, header_id);
crate::mir::phi_core::loop_phi::save_block_snapshot(
&mut self.block_var_maps,
preheader_id,
@ -409,17 +417,34 @@ impl<'a> LoopBuilder<'a> {
dst: ValueId,
inputs: Vec<(BasicBlockId, ValueId)>,
) -> Result<(), String> {
eprintln!("[DEBUG] LoopBuilder::emit_phi_at_block_start: block={}, dst=%{}, inputs={:?}", block_id, dst.0, inputs);
// Phi nodeをブロックの先頭に挿入
if let Some(ref mut function) = self.parent_builder.current_function {
if let Some(block) = function.get_block_mut(block_id) {
eprintln!("[DEBUG] Block {} current instructions count: {}", block_id, block.instructions.len());
// Phi命令は必ずブロックの先頭に配置
let phi_inst = MirInstruction::Phi { dst, inputs };
let phi_inst = MirInstruction::Phi { dst, inputs: inputs.clone() };
block.instructions.insert(0, phi_inst);
eprintln!("[DEBUG] ✅ PHI instruction inserted at position 0");
eprintln!("[DEBUG] Block {} after insert instructions count: {}", block_id, block.instructions.len());
// Verify PHI is still there
if let Some(first_inst) = block.instructions.get(0) {
match first_inst {
MirInstruction::Phi { dst: phi_dst, .. } => {
eprintln!("[DEBUG] Verified: First instruction is PHI dst=%{}", phi_dst.0);
}
other => {
eprintln!("[DEBUG] ⚠️ WARNING: First instruction is NOT PHI! It's {:?}", other);
}
}
}
Ok(())
} else {
eprintln!("[DEBUG] ❌ Block {} not found!", block_id);
Err(format!("Block {} not found", block_id))
}
} else {
eprintln!("[DEBUG] ❌ No current function!");
Err("No current function".to_string())
}
}
@ -465,6 +490,7 @@ impl<'a> LoopBuilder<'a> {
}
fn update_variable(&mut self, name: String, value: ValueId) {
eprintln!("[DEBUG] LoopBuilder::update_variable: name={}, value=%{}", name, value.0);
self.parent_builder.variable_map.insert(name, value);
}
@ -716,4 +742,26 @@ impl crate::mir::phi_core::loop_phi::LoopPhiOps for LoopBuilder<'_> {
crate::mir::phi_core::common::debug_verify_phi_inputs(func, merge_bb, inputs);
}
}
fn emit_copy_at_preheader(
&mut self,
preheader_id: BasicBlockId,
dst: ValueId,
src: ValueId,
) -> Result<(), String> {
eprintln!("[DEBUG] emit_copy_at_preheader: preheader={}, dst=%{}, src=%{}", preheader_id, dst.0, src.0);
if let Some(ref mut function) = self.parent_builder.current_function {
if let Some(block) = function.get_block_mut(preheader_id) {
eprintln!("[DEBUG] Adding Copy instruction to block {}", preheader_id);
block.add_instruction(MirInstruction::Copy { dst, src });
Ok(())
} else {
eprintln!("[DEBUG] ❌ Preheader block {} not found!", preheader_id);
Err(format!("Preheader block {} not found", preheader_id))
}
} else {
eprintln!("[DEBUG] ❌ No current function!");
Err("No current function".to_string())
}
}
}

View File

@ -40,6 +40,14 @@ pub trait LoopPhiOps {
fn update_var(&mut self, name: String, value: ValueId);
fn get_variable_at_block(&mut self, name: &str, block: BasicBlockId) -> Option<ValueId>;
fn debug_verify_phi_inputs(&mut self, _merge_bb: BasicBlockId, _inputs: &[(BasicBlockId, ValueId)]) {}
/// PHI UseBeforeDef修正: preheaderブロックでCopy命令を先行生成
fn emit_copy_at_preheader(
&mut self,
preheader_id: BasicBlockId,
dst: ValueId,
src: ValueId,
) -> Result<(), String>;
}
/// Finalize PHIs at loop exit (merge of break points and header fall-through).
@ -130,15 +138,31 @@ pub fn prepare_loop_variables_with<O: LoopPhiOps>(
preheader_id: BasicBlockId,
current_vars: &std::collections::HashMap<String, ValueId>,
) -> Result<Vec<IncompletePhi>, String> {
// 🎯 修正: current_varsをpreheader時点の値のみに限定header blockで定義された値を除外
// これにより、UseBeforeDefPHI inputsにheader内で定義された値が含まれるを防ぐ
let mut incomplete_phis: Vec<IncompletePhi> = Vec::new();
for (var_name, &value_before) in current_vars.iter() {
// Skip pinned variables (internal compiler temporaries)
if var_name.starts_with("__pin$") {
// Pinned variables are materialized via entry-phi in loop body, skip here
continue;
}
// Materialize the incoming value at preheader to satisfy UseBeforeDef constraints
// even when `value_before` was defined in a different block (e.g., previous loop header).
let pre_copy = ops.new_value();
ops.emit_copy_at_preheader(preheader_id, pre_copy, value_before)?;
let phi_id = ops.new_value();
let inc = IncompletePhi {
phi_id,
var_name: var_name.clone(),
known_inputs: vec![(preheader_id, value_before)],
known_inputs: vec![(preheader_id, pre_copy)], // ensure def at preheader
};
incomplete_phis.push(inc);
// 変数マップを即座に更新して、条件式評価時にPHI IDを使用する
// これにより、DCEがPHI命令を削除することを防ぐ
ops.update_var(var_name.clone(), phi_id);
}
Ok(incomplete_phis)

View File

@ -16,23 +16,42 @@ pub(super) fn lower_loop_stmt(
let cond_bb = new_block(f);
let body_bb = new_block(f);
let exit_bb = new_block(f);
// フェーズM.2: no_phi変数削除 + PHI UseBeforeDef修正
let base_vars = vars.clone();
let orig_names: Vec<String> = base_vars.keys().cloned().collect();
// Step 1: cur_bbでCopy命令を先に生成PHI inputsの定義を確保
let mut copy_map: HashMap<String, ValueId> = HashMap::new();
for name in &orig_names {
if let Some(&bval) = base_vars.get(name) {
let copy_dst = f.next_value_id();
if let Some(bb) = f.get_block_mut(cur_bb) {
bb.add_instruction(MirInstruction::Copy {
dst: copy_dst,
src: bval,
});
}
copy_map.insert(name.clone(), copy_dst);
}
}
// Step 2: cur_bbからcond_bbへのJumpを挿入
if let Some(bb) = f.get_block_mut(cur_bb) {
if !bb.is_terminated() {
bb.add_instruction(MirInstruction::Jump { target: cond_bb });
}
}
// フェーズM.2: no_phi変数削除
let base_vars = vars.clone();
let orig_names: Vec<String> = base_vars.keys().cloned().collect();
// Step 3: cond_bbでPHI命令生成copy_mapの値を使用
let mut phi_map: HashMap<String, ValueId> = HashMap::new();
for name in &orig_names {
if let Some(&bval) = base_vars.get(name) {
if let Some(&copy_val) = copy_map.get(name) {
let dst = f.next_value_id();
// フェーズM.2: PHI統一処理no_phi分岐削除
if let Some(bb) = f.get_block_mut(cond_bb) {
bb.insert_instruction_after_phis(MirInstruction::Phi {
dst,
inputs: vec![(cur_bb, bval)],
inputs: vec![(cur_bb, copy_val)],
});
}
phi_map.insert(name.clone(), dst);