tomoaki/hakorune
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Phase 25.1 完了 - LoopForm v2/Stage1 CLI/環境変数削減 + Phase 26-D からの変更

Browse Source 
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:
nyash-codex
2025-11-21 06:25:17 +09:00
parent baf028a94f
commit f9d100ce01
366 changed files with 14322 additions and 5236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

388
src/mir/instruction_kinds/mod.rs
View File

@ -59,16 +59,25 @@ pub struct ConstInst {
impl ConstInst {
pub fn from_mir(i: &MirInstruction) -> Option<Self> {
match i {
MirInstruction::Const { dst, value } => Some(ConstInst { dst: *dst, value: value.clone() }),
MirInstruction::Const { dst, value } => Some(ConstInst {
dst: *dst,
value: value.clone(),
}),
_ => None,
}
}
}
impl InstructionMeta for ConstInst {
fn effects(&self) -> EffectMask { EffectMask::PURE }
fn dst(&self) -> Option<ValueId> { Some(self.dst) }
fn used(&self) -> Vec<ValueId> { Vec::new() }
fn effects(&self) -> EffectMask {
EffectMask::PURE
}
fn dst(&self) -> Option<ValueId> {
Some(self.dst)
}
fn used(&self) -> Vec<ValueId> {
Vec::new()
}
}
// ---- BinOp ----
@ -83,103 +92,262 @@ pub struct BinOpInst {
impl BinOpInst {
pub fn from_mir(i: &MirInstruction) -> Option<Self> {
match i {
MirInstruction::BinOp { dst, op, lhs, rhs } => Some(BinOpInst { dst: *dst, op: *op, lhs: *lhs, rhs: *rhs }),
MirInstruction::BinOp { dst, op, lhs, rhs } => Some(BinOpInst {
dst: *dst,
op: *op,
lhs: *lhs,
rhs: *rhs,
}),
_ => None,
}
}
}
impl InstructionMeta for BinOpInst {
fn effects(&self) -> EffectMask { EffectMask::PURE }
fn dst(&self) -> Option<ValueId> { Some(self.dst) }
fn used(&self) -> Vec<ValueId> { vec![self.lhs, self.rhs] }
fn effects(&self) -> EffectMask {
EffectMask::PURE
}
fn dst(&self) -> Option<ValueId> {
Some(self.dst)
}
fn used(&self) -> Vec<ValueId> {
vec![self.lhs, self.rhs]
}
}
// ---- Helper delegation for MirInstruction methods ----
pub fn effects_via_meta(i: &MirInstruction) -> Option<EffectMask> {
if let Some(k) = ConstInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = BinOpInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = UnaryOpInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = CompareInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = LoadInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = CastInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = TypeOpInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = ArrayGetInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = PhiInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = NewBoxInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = StoreInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = ArraySetInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = ReturnInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = BranchInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = JumpInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = PrintInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = DebugInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = TypeCheckInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = CopyInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = NopInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = ThrowInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = CatchInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = SafepointInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = NewClosureInst::from_mir(i) { return Some(k.effects()); }
if let Some(k) = ConstInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = BinOpInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = UnaryOpInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = CompareInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = LoadInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = CastInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = TypeOpInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = ArrayGetInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = PhiInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = NewBoxInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = StoreInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = ArraySetInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = ReturnInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = BranchInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = JumpInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = PrintInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = DebugInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = TypeCheckInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = CopyInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = NopInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = ThrowInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = CatchInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = SafepointInst::from_mir(i) {
return Some(k.effects());
}
if let Some(k) = NewClosureInst::from_mir(i) {
return Some(k.effects());
}
None
}
pub fn dst_via_meta(i: &MirInstruction) -> Option<ValueId> {
if let Some(k) = ConstInst::from_mir(i) { return k.dst(); }
if let Some(k) = BinOpInst::from_mir(i) { return k.dst(); }
if let Some(k) = UnaryOpInst::from_mir(i) { return k.dst(); }
if let Some(k) = CompareInst::from_mir(i) { return k.dst(); }
if let Some(k) = LoadInst::from_mir(i) { return k.dst(); }
if let Some(k) = CastInst::from_mir(i) { return k.dst(); }
if let Some(k) = TypeOpInst::from_mir(i) { return k.dst(); }
if let Some(k) = ArrayGetInst::from_mir(i) { return k.dst(); }
if let Some(k) = PhiInst::from_mir(i) { return k.dst(); }
if let Some(k) = NewBoxInst::from_mir(i) { return k.dst(); }
if let Some(_k) = StoreInst::from_mir(i) { return None; }
if let Some(_k) = ArraySetInst::from_mir(i) { return None; }
if let Some(_k) = ReturnInst::from_mir(i) { return None; }
if let Some(_k) = BranchInst::from_mir(i) { return None; }
if let Some(_k) = JumpInst::from_mir(i) { return None; }
if let Some(_k) = PrintInst::from_mir(i) { return None; }
if let Some(_k) = DebugInst::from_mir(i) { return None; }
if let Some(k) = CallLikeInst::from_mir(i) { return k.dst(); }
if let Some(k) = TypeCheckInst::from_mir(i) { return k.dst(); }
if let Some(k) = CopyInst::from_mir(i) { return k.dst(); }
if let Some(_k) = NopInst::from_mir(i) { return None; }
if let Some(_k) = ThrowInst::from_mir(i) { return None; }
if let Some(k) = CatchInst::from_mir(i) { return k.dst(); }
if let Some(_k) = SafepointInst::from_mir(i) { return None; }
if let Some(k) = NewClosureInst::from_mir(i) { return k.dst(); }
if let Some(k) = ConstInst::from_mir(i) {
return k.dst();
}
if let Some(k) = BinOpInst::from_mir(i) {
return k.dst();
}
if let Some(k) = UnaryOpInst::from_mir(i) {
return k.dst();
}
if let Some(k) = CompareInst::from_mir(i) {
return k.dst();
}
if let Some(k) = LoadInst::from_mir(i) {
return k.dst();
}
if let Some(k) = CastInst::from_mir(i) {
return k.dst();
}
if let Some(k) = TypeOpInst::from_mir(i) {
return k.dst();
}
if let Some(k) = ArrayGetInst::from_mir(i) {
return k.dst();
}
if let Some(k) = PhiInst::from_mir(i) {
return k.dst();
}
if let Some(k) = NewBoxInst::from_mir(i) {
return k.dst();
}
if let Some(_k) = StoreInst::from_mir(i) {
return None;
}
if let Some(_k) = ArraySetInst::from_mir(i) {
return None;
}
if let Some(_k) = ReturnInst::from_mir(i) {
return None;
}
if let Some(_k) = BranchInst::from_mir(i) {
return None;
}
if let Some(_k) = JumpInst::from_mir(i) {
return None;
}
if let Some(_k) = PrintInst::from_mir(i) {
return None;
}
if let Some(_k) = DebugInst::from_mir(i) {
return None;
}
if let Some(k) = CallLikeInst::from_mir(i) {
return k.dst();
}
if let Some(k) = TypeCheckInst::from_mir(i) {
return k.dst();
}
if let Some(k) = CopyInst::from_mir(i) {
return k.dst();
}
if let Some(_k) = NopInst::from_mir(i) {
return None;
}
if let Some(_k) = ThrowInst::from_mir(i) {
return None;
}
if let Some(k) = CatchInst::from_mir(i) {
return k.dst();
}
if let Some(_k) = SafepointInst::from_mir(i) {
return None;
}
if let Some(k) = NewClosureInst::from_mir(i) {
return k.dst();
}
None
}
pub fn used_via_meta(i: &MirInstruction) -> Option<Vec<ValueId>> {
if let Some(k) = ConstInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = BinOpInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = UnaryOpInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = CompareInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = LoadInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = CastInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = TypeOpInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = ArrayGetInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = PhiInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = NewBoxInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = StoreInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = ArraySetInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = ReturnInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = BranchInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = JumpInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = PrintInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = DebugInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = CallLikeInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = TypeCheckInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = CopyInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = NopInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = ThrowInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = CatchInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = SafepointInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = NewClosureInst::from_mir(i) { return Some(k.used()); }
if let Some(k) = ConstInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = BinOpInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = UnaryOpInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = CompareInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = LoadInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = CastInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = TypeOpInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = ArrayGetInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = PhiInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = NewBoxInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = StoreInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = ArraySetInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = ReturnInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = BranchInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = JumpInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = PrintInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = DebugInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = CallLikeInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = TypeCheckInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = CopyInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = NopInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = ThrowInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = CatchInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = SafepointInst::from_mir(i) {
return Some(k.used());
}
if let Some(k) = NewClosureInst::from_mir(i) {
return Some(k.used());
}
None
}
@ -548,23 +716,55 @@ inst_meta! {
// ---- Call-like (dst/used only; effects fallback in MirInstruction) ----
#[derive(Debug, Clone)]
pub enum CallLikeInst {
Call { dst: Option<ValueId>, func: ValueId, args: Vec<ValueId> },
BoxCall { dst: Option<ValueId>, box_val: ValueId, args: Vec<ValueId> },
PluginInvoke { dst: Option<ValueId>, box_val: ValueId, args: Vec<ValueId> },
ExternCall { dst: Option<ValueId>, args: Vec<ValueId> },
Call {
dst: Option<ValueId>,
func: ValueId,
args: Vec<ValueId>,
},
BoxCall {
dst: Option<ValueId>,
box_val: ValueId,
args: Vec<ValueId>,
},
PluginInvoke {
dst: Option<ValueId>,
box_val: ValueId,
args: Vec<ValueId>,
},
ExternCall {
dst: Option<ValueId>,
args: Vec<ValueId>,
},
}
impl CallLikeInst {
pub fn from_mir(i: &MirInstruction) -> Option<Self> {
match i {
MirInstruction::Call { dst, func, args, .. } =>
Some(CallLikeInst::Call { dst: *dst, func: *func, args: args.clone() }),
MirInstruction::BoxCall { dst, box_val, args, .. } =>
Some(CallLikeInst::BoxCall { dst: *dst, box_val: *box_val, args: args.clone() }),
MirInstruction::PluginInvoke { dst, box_val, args, .. } =>
Some(CallLikeInst::PluginInvoke { dst: *dst, box_val: *box_val, args: args.clone() }),
MirInstruction::ExternCall { dst, args, .. } =>
Some(CallLikeInst::ExternCall { dst: *dst, args: args.clone() }),
MirInstruction::Call {
dst, func, args, ..
} => Some(CallLikeInst::Call {
dst: *dst,
func: *func,
args: args.clone(),
}),
MirInstruction::BoxCall {
dst, box_val, args, ..
} => Some(CallLikeInst::BoxCall {
dst: *dst,
box_val: *box_val,
args: args.clone(),
}),
MirInstruction::PluginInvoke {
dst, box_val, args, ..
} => Some(CallLikeInst::PluginInvoke {
dst: *dst,
box_val: *box_val,
args: args.clone(),
}),
MirInstruction::ExternCall { dst, args, .. } => Some(CallLikeInst::ExternCall {
dst: *dst,
args: args.clone(),
}),
_ => None,
}
}