chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更
Phase 25.1 完了成果: - ✅ LoopForm v2 テスト・ドキュメント・コメント完備 - 4ケース(A/B/C/D)完全テストカバレッジ - 最小再現ケース作成(SSAバグ調査用) - SSOT文書作成(loopform_ssot.md) - 全ソースに [LoopForm] コメントタグ追加 - ✅ Stage-1 CLI デバッグ環境構築 - stage1_cli.hako 実装 - stage1_bridge.rs ブリッジ実装 - デバッグツール作成(stage1_debug.sh/stage1_minimal.sh) - アーキテクチャ改善提案文書 - ✅ 環境変数削減計画策定 - 25変数の完全調査・分類 - 6段階削減ロードマップ(25→5、80%削減) - 即時削除可能変数特定(NYASH_CONFIG/NYASH_DEBUG) Phase 26-D からの累積変更: - PHI実装改善(ExitPhiBuilder/HeaderPhiBuilder等) - MIRビルダーリファクタリング - 型伝播・最適化パス改善 - その他約300ファイルの累積変更 🎯 技術的成果: - SSAバグ根本原因特定(条件分岐内loop変数変更) - Region+next_iパターン適用完了(UsingCollectorBox等) - LoopFormパターン文書化・テスト化完了 - セルフホスティング基盤強化 Co-Authored-By: Claude <noreply@anthropic.com> Co-Authored-By: ChatGPT <noreply@openai.com> Co-Authored-By: Task Assistant <task@anthropic.com>
This commit is contained in:
@ -5,11 +5,11 @@
|
||||
//! - BoxCompilationContext による完全独立化
|
||||
//! - パラメータ・型情報の適切な管理
|
||||
|
||||
use crate::ast::ASTNode;
|
||||
use crate::mir::builder::{MirBuilder, MirType, MirInstruction};
|
||||
use crate::mir::{MirValueKind, ValueId}; // Phase 26-A-3: ValueId型安全化
|
||||
use crate::mir::region::function_slot_registry::FunctionSlotRegistry;
|
||||
use super::function_lowering;
|
||||
use crate::ast::ASTNode;
|
||||
use crate::mir::builder::{MirBuilder, MirInstruction, MirType};
|
||||
use crate::mir::region::function_slot_registry::FunctionSlotRegistry;
|
||||
use crate::mir::{MirValueKind, ValueId}; // Phase 26-A-3: ValueId型安全化
|
||||
use std::collections::HashMap;
|
||||
|
||||
/// 🎯 箱理論: Lowering Context(準備と復元)
|
||||
@ -24,10 +24,7 @@ struct LoweringContext {
|
||||
|
||||
impl MirBuilder {
|
||||
/// 🎯 箱理論: Step 1 - Lowering Context準備
|
||||
fn prepare_lowering_context(
|
||||
&mut self,
|
||||
func_name: &str,
|
||||
) -> LoweringContext {
|
||||
fn prepare_lowering_context(&mut self, func_name: &str) -> LoweringContext {
|
||||
// Static box context設定
|
||||
let saved_static_ctx = self.current_static_box.clone();
|
||||
if let Some(pos) = func_name.find('.') {
|
||||
@ -77,11 +74,8 @@ impl MirBuilder {
|
||||
body: &[ASTNode],
|
||||
ctx: &mut LoweringContext,
|
||||
) -> Result<(), String> {
|
||||
let signature = function_lowering::prepare_static_method_signature(
|
||||
func_name.clone(),
|
||||
params,
|
||||
body,
|
||||
);
|
||||
let signature =
|
||||
function_lowering::prepare_static_method_signature(func_name.clone(), params, body);
|
||||
let entry = self.block_gen.next();
|
||||
let function = super::super::MirFunction::new(signature, entry);
|
||||
|
||||
@ -89,7 +83,10 @@ impl MirBuilder {
|
||||
ctx.saved_function = self.current_function.take();
|
||||
ctx.saved_block = self.current_block.take();
|
||||
|
||||
eprintln!("[DEBUG/create_function_skeleton] Creating function: {}", func_name);
|
||||
eprintln!(
|
||||
"[DEBUG/create_function_skeleton] Creating function: {}",
|
||||
func_name
|
||||
);
|
||||
eprintln!("[DEBUG/create_function_skeleton] Entry block: {:?}", entry);
|
||||
|
||||
// 新しい関数に切り替え
|
||||
@ -116,9 +113,15 @@ impl MirBuilder {
|
||||
if let Some(ref mut f) = self.current_function {
|
||||
// 📦 Hotfix 5: Use pre-populated params from MirFunction::new()
|
||||
// Static methods have implicit receiver at params[0], so actual parameters start at offset
|
||||
let receiver_offset = if f.params.is_empty() { 0 } else {
|
||||
let receiver_offset = if f.params.is_empty() {
|
||||
0
|
||||
} else {
|
||||
// If params already populated (by Hotfix 4+5), use them
|
||||
if f.params.len() > params.len() { 1 } else { 0 }
|
||||
if f.params.len() > params.len() {
|
||||
1
|
||||
} else {
|
||||
0
|
||||
}
|
||||
};
|
||||
|
||||
let param_types = f.signature.params.clone();
|
||||
@ -186,8 +189,7 @@ impl MirBuilder {
|
||||
|
||||
// 型推論
|
||||
if let Some(ref mut f) = self.current_function {
|
||||
if returns_value
|
||||
&& matches!(f.signature.return_type, MirType::Void | MirType::Unknown)
|
||||
if returns_value && matches!(f.signature.return_type, MirType::Void | MirType::Unknown)
|
||||
{
|
||||
let mut inferred: Option<MirType> = None;
|
||||
'search: for (_bid, bb) in f.blocks.iter() {
|
||||
@ -254,12 +256,8 @@ impl MirBuilder {
|
||||
body: &[ASTNode],
|
||||
ctx: &mut LoweringContext,
|
||||
) -> Result<(), String> {
|
||||
let signature = function_lowering::prepare_method_signature(
|
||||
func_name,
|
||||
box_name,
|
||||
params,
|
||||
body,
|
||||
);
|
||||
let signature =
|
||||
function_lowering::prepare_method_signature(func_name, box_name, params, body);
|
||||
let entry = self.block_gen.next();
|
||||
let function = super::super::MirFunction::new(signature, entry);
|
||||
|
||||
@ -418,8 +416,7 @@ impl MirBuilder {
|
||||
|
||||
// 型推論(Step 5の一部として)
|
||||
if let Some(ref mut f) = self.current_function {
|
||||
if returns_value
|
||||
&& matches!(f.signature.return_type, MirType::Void | MirType::Unknown)
|
||||
if returns_value && matches!(f.signature.return_type, MirType::Void | MirType::Unknown)
|
||||
{
|
||||
let mut inferred: Option<MirType> = None;
|
||||
'search: for (_bid, bb) in f.blocks.iter() {
|
||||
|
||||
Reference in New Issue
Block a user