6a452b2dca
A案実装: debug_verify_phi_inputs呼び出し前にCFG predecessorを更新
修正箇所（7箇所）:
- src/mir/builder/phi.rs:50, 73, 132, 143
- src/mir/builder/ops.rs:273, 328, 351
根本原因:
- Branch/Jump命令でsuccessorは即座に更新
- predecessorはupdate_cfg()で遅延再構築
- PHI検証が先に実行されてpredecessor未更新でpanic
解決策:
- 各debug_verify_phi_inputs呼び出し前に
if let Some(func) = self.current_function.as_mut() {
func.update_cfg();
}
を挿入してCFGを同期
影響: if/else文、論理演算子(&&/||)のPHI生成が正常動作
52 lines
1.6 KiB
Plaintext
52 lines
1.6 KiB
Plaintext
// Mini-VM: function-based entry for branching
|
|
// Local static box (duplicated from mini_vm_lib for now to avoid include gate issues)
|
|
using "lang/src/shared/common/string_helpers.hako" as StringHelpers
|
|
static box MiniVm {
|
|
read_digits(json, pos) { return StringHelpers.read_digits(json, pos) }
|
|
parse_first_int(json) {
|
|
@key = "\"value\":{\"type\":\"int\",\"value\":"
|
|
@idx = json.lastIndexOf(key)
|
|
if idx < 0 { return "0" }
|
|
@start = idx + key.length()
|
|
return me.read_digits(json, start)
|
|
}
|
|
run_branch(json) {
|
|
@n = me.parse_first_int(json)
|
|
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
|
print("20")
|
|
return 0
|
|
}
|
|
}
|
|
|
|
// Program entry: embedded JSON (value=1 → print 10; else → 20)
|
|
static box Main {
|
|
main(args) {
|
|
@vm = new MiniVm()
|
|
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
|
// If provided, override by argv[0]
|
|
if args {
|
|
if args.length() > 0 {
|
|
@s = args.get(0)
|
|
if s { json = s }
|
|
}
|
|
}
|
|
return MiniVm.run_branch(json)
|
|
}
|
|
}
|
|
|
|
// Top-level fallback entry for current runner
|
|
function main(args) {
|
|
@vm = new MiniVm()
|
|
@json = "{\"kind\":\"Program\",\"statements\":[{\"kind\":\"Print\",\"expression\":{\"kind\":\"Literal\",\"value\":{\"type\":\"int\",\"value\":1}}}]}"
|
|
if args {
|
|
if args.length() > 0 {
|
|
@s = args.get(0)
|
|
if s { json = s }
|
|
}
|
|
}
|
|
@n = MiniVm.parse_first_int(json)
|
|
if n == "0" || n == "1" || n == "2" || n == "3" || n == "4" { print("10") return 0 }
|
|
print("20")
|
|
return 0
|
|
}
|