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

fix(mir): PHI検証panic修正 - update_cfg()を検証前に呼び出し

Browse Source 
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生成が正常動作
This commit is contained in:
nyash-codex
2025-11-01 13:28:56 +09:00
parent 149ec61d4d
commit 6a452b2dca
174 changed files with 2432 additions and 1014 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
lang/src/externs/normalize/core_extern_normalize.hako
View File

@ -25,12 +25,12 @@ static box CoreExternNormalize {
loop(true) {
// skip whitespace/commas
loop(true) {
if pos >= arr.size() { break }
if pos >= arr.length() { break }
local ch = arr.substring(pos,pos+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" || ch == "," { pos = pos + 1 continue }
break
}
if pos >= arr.size() { break }
if pos >= arr.length() { break }
if arr.substring(pos,pos+1) != "{" { break }
local end = JsonCursorBox.seek_obj_end(arr, pos)
if end < 0 { break }
@ -40,10 +40,10 @@ static box CoreExternNormalize {
pos = end + 1
}
// Join functions
local n = out.size(); local i=0; local joined=""
local n = out.length(); local i=0; local joined=""
loop(i<n) { joined = joined + out.get(i); if i<n-1 { joined = joined + ",\n " }; i=i+1 }
// Splice back
return j.substring(0, lb_funcs+1) + joined + j.substring(rb_funcs, j.size())
return j.substring(0, lb_funcs+1) + joined + j.substring(rb_funcs, j.length())
}
_rewrite_function_json(f) {
@ -64,7 +64,7 @@ static box CoreExternNormalize {
local qend = JsonCursorBox.scan_string_end(f2, q)
if qend >= 0 {
local prefix = f2.substring(0, qend+1)
local suffix = f2.substring(qend+1, f2.size())
local suffix = f2.substring(qend+1, f2.length())
local insert = ", \"entry\": " + ("" + eid)
f2 = prefix + insert + suffix
}
@ -88,12 +88,12 @@ static box CoreExternNormalize {
loop(true) {
// skip ws/commas
loop(true) {
if bp >= blocks.size() { break }
if bp >= blocks.length() { break }
local ch = blocks.substring(bp,bp+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" || ch == "," { bp = bp + 1 continue }
break
}
if bp >= blocks.size() { break }
if bp >= blocks.length() { break }
if blocks.substring(bp,bp+1) != "{" { break }
local be = JsonCursorBox.seek_obj_end(blocks, bp)
if be < 0 { break }
@ -102,9 +102,9 @@ static box CoreExternNormalize {
bout.push(blk2)
bp = be + 1
}
local nb = bout.size(); local bi=0; local bjoined=""
local nb = bout.length(); local bi=0; local bjoined=""
loop(bi<nb) { bjoined=bjoined + bout.get(bi); if bi<nb-1 { bjoined=bjoined + ",\n " }; bi=bi+1 }
return f2.substring(0, lb_b+1) + bjoined + f2.substring(rb_b, f2.size())
return f2.substring(0, lb_b+1) + bjoined + f2.substring(rb_b, f2.length())
}
_rewrite_block_json(blk) {
@ -125,9 +125,9 @@ static box CoreExternNormalize {
out.push(me._map_string_calls(obj))
}
// Join back
local n = out.size(); local idx = 0; local joined = ""
local n = out.length(); local idx = 0; local joined = ""
loop(idx < n) { joined = joined + out.get(idx); if idx < n-1 { joined = joined + ",\n" }; idx = idx + 1 }
return blk.substring(0, lb_i+1) + joined + blk.substring(rb_i, blk.size())
return blk.substring(0, lb_i+1) + joined + blk.substring(rb_i, blk.length())
}
_map_string_calls(obj) {
@ -145,7 +145,7 @@ static box CoreExternNormalize {
// String.substring(recv,start,end)
if obj.indexOf("\"method\":\"substring\"") >= 0 {
local recv = me._read_digits(obj, "receiver"); local dst = me._read_digits(obj, "dst"); local args = me._read_args_digits(obj)
if recv != "" && dst != "" && args.size() >= 2 {
if recv != "" && dst != "" && args.length() >= 2 {
local a0 = args.get(0); local a1 = args.get(1)
return me._build_mir_call(dst, "nyrt.string.substring", "[" + recv + "," + a0 + "," + a1 + "]", flags)
}
@ -154,9 +154,9 @@ static box CoreExternNormalize {
// String.indexOf/ find (recv, needle[, from])
if obj.indexOf("\"method\":\"indexOf\"") >= 0 || obj.indexOf("\"method\":\"find\"") >= 0 {
local recv = me._read_digits(obj, "receiver"); local dst = me._read_digits(obj, "dst"); local args = me._read_args_digits(obj)
if recv != "" && dst != "" && args.size() >= 1 {
if recv != "" && dst != "" && args.length() >= 1 {
local arg_str = "[" + recv + "," + args.get(0)
if args.size() >= 2 { arg_str = arg_str + "," + args.get(1) }
if args.length() >= 2 { arg_str = arg_str + "," + args.get(1) }
arg_str = arg_str + "]"
return me._build_mir_call(dst, "nyrt.string.indexOf", arg_str, flags)
}
@ -165,9 +165,9 @@ static box CoreExternNormalize {
// String.lastIndexOf(recv, needle[, from])
if obj.indexOf("\"method\":\"lastIndexOf\"") >= 0 {
local recv = me._read_digits(obj, "receiver"); local dst = me._read_digits(obj, "dst"); local args = me._read_args_digits(obj)
if recv != "" && dst != "" && args.size() >= 1 {
if recv != "" && dst != "" && args.length() >= 1 {
local arg_str = "[" + recv + "," + args.get(0)
if args.size() >= 2 { arg_str = arg_str + "," + args.get(1) }
if args.length() >= 2 { arg_str = arg_str + "," + args.get(1) }
arg_str = arg_str + "]"
return me._build_mir_call(dst, "nyrt.string.lastIndexOf", arg_str, flags)
}
@ -176,7 +176,7 @@ static box CoreExternNormalize {
// String.replace(recv, needle)
if obj.indexOf("\"method\":\"replace\"") >= 0 {
local recv = me._read_digits(obj, "receiver"); local dst = me._read_digits(obj, "dst"); local args = me._read_args_digits(obj)
if recv != "" && dst != "" && args.size() >= 2 {
if recv != "" && dst != "" && args.length() >= 2 {
local a0 = args.get(0); local a1 = args.get(1)
return me._build_mir_call(dst, "nyrt.string.replace", "[" + recv + "," + a0 + "," + a1 + "]", flags)
}
@ -185,7 +185,7 @@ static box CoreExternNormalize {
// String.charAt(recv, idx)
if obj.indexOf("\"method\":\"charAt\"") >= 0 {
local recv = me._read_digits(obj, "receiver"); local dst = me._read_digits(obj, "dst"); local args = me._read_args_digits(obj)
if recv != "" && dst != "" && args.size() >= 1 {
if recv != "" && dst != "" && args.length() >= 1 {
local a0 = args.get(0)
return me._build_mir_call(dst, "nyrt.string.charAt", "[" + recv + "," + a0 + "]", flags)
}
@ -232,20 +232,20 @@ static box CoreExternNormalize {
local i = lb + 1
loop(true) {
i = me._skip_ws(json, i)
if i >= json.size() { break }
if i >= json.length() { break }
local ch = json.substring(i,i+1)
if ch == "]" { break }
local ds = JsonCursorBox.digits_from(json, i)
if ds == "" { break }
out.push(ds)
i = i + ds.size()
i = i + ds.length()
}
return out
}
_skip_ws(json, pos) {
local i = pos
local n = json.size()
local n = json.length()
loop(i < n) {
local ch = json.substring(i,i+1)
if ch == " " || ch == "\n" || ch == "\r" || ch == "\t" || ch == "," { i = i + 1 continue }