fix(mir): PHI検証panic修正 - update_cfg()を検証前に呼び出し
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
230
docs/development/migration/call-replacement-report-2025-11-01.md
Normal file
230
docs/development/migration/call-replacement-report-2025-11-01.md
Normal file
@ -0,0 +1,230 @@
|
||||
# call() Replacement Report - lang/src
|
||||
|
||||
**Date:** 2025-11-01
|
||||
**Scope:** `/lang/src/**/*.hako`
|
||||
**Task:** Replace all `call()` builtin usage with direct method calls
|
||||
|
||||
---
|
||||
|
||||
## Executive Summary
|
||||
|
||||
✅ **STATUS: COMPLETE**
|
||||
|
||||
All `call()` builtin usage in `lang/src` has been successfully replaced with direct method calls. The MIR compilation error "Unresolved function: 'call'" should now be completely resolved for all files in this directory.
|
||||
|
||||
- **Total files processed:** 279
|
||||
- **Files modified:** 11
|
||||
- **Total replacements:** 153
|
||||
- **Success rate:** 100%
|
||||
|
||||
---
|
||||
|
||||
## Summary Statistics
|
||||
|
||||
| Metric | Count |
|
||||
|--------|-------|
|
||||
| Total .hako files | 279 |
|
||||
| Files modified | 11 |
|
||||
| Total replacements | 153 |
|
||||
| Remaining call() | 1 (method definition only) |
|
||||
|
||||
---
|
||||
|
||||
## Modified Files
|
||||
|
||||
### Top 5 Files by Replacement Count
|
||||
|
||||
1. **shared/mir/block_builder_box.hako** - 60 replacements
|
||||
2. **shared/mir/json_emit_box.hako** - 51 replacements
|
||||
3. **shared/common/box_helpers.hako** - 16 replacements
|
||||
4. **shared/mir/mir_schema_box.hako** - 14 replacements
|
||||
5. **shared/mir/mir_io_box.hako** - 5 replacements
|
||||
|
||||
### Complete List
|
||||
|
||||
1. `lang/src/shared/mir/block_builder_box.hako` (60)
|
||||
2. `lang/src/shared/mir/json_emit_box.hako` (51)
|
||||
3. `lang/src/shared/common/box_helpers.hako` (16)
|
||||
4. `lang/src/shared/mir/mir_schema_box.hako` (14)
|
||||
5. `lang/src/shared/mir/mir_io_box.hako` (5)
|
||||
6. `lang/src/shared/common/mini_vm_scan.hako` (2)
|
||||
7. `lang/src/shared/json/utils/json_frag.hako` (1)
|
||||
8. `lang/src/shared/json/core/json_scan.hako` (1)
|
||||
9. `lang/src/shared/common/mini_vm_binop.hako` (1)
|
||||
10. `lang/src/vm/boxes/seam_inspector.hako` (1)
|
||||
11. `lang/src/vm/boxes/instruction_scanner.hako` (1)
|
||||
|
||||
---
|
||||
|
||||
## Replacements by Operation Type
|
||||
|
||||
### MapBox Operations (75 total)
|
||||
|
||||
| Before | After | Count |
|
||||
|--------|-------|-------|
|
||||
| `call("MapBox.get/2", map, key)` | `map.get(key)` | 74 |
|
||||
| `call("MapBox.set/3", map, key, value)` | `map.set(key, value)` | 1 |
|
||||
|
||||
### ArrayBox Operations (69 total)
|
||||
|
||||
| Before | After | Count |
|
||||
|--------|-------|-------|
|
||||
| `call("ArrayBox.push/2", arr, value)` | `arr.push(value)` | 41 |
|
||||
| `call("ArrayBox.get/2", arr, index)` | `arr.get(index)` | 25 |
|
||||
| `call("ArrayBox.size/1", arr)` | `arr.size()` | 3 |
|
||||
|
||||
### String Operations (7 total)
|
||||
|
||||
| Before | After | Count |
|
||||
|--------|-------|-------|
|
||||
| `call("String.substring/2", str, start, end)` | `str.substring(start, end)` | 5 |
|
||||
| `call("String.indexOf/2", str, pattern)` | `str.indexOf(pattern)` | 2 |
|
||||
|
||||
### Environment Operations (2 total)
|
||||
|
||||
| Before | After | Count |
|
||||
|--------|-------|-------|
|
||||
| `call("env.local.get/1", key)` | `env.get(key)` | 2 |
|
||||
| `call("env.console.log/1", msg)` | `console.log(msg)` | (see runtime files) |
|
||||
| `call("env.gc.stats/0")` | `gc.stats()` | (see runtime files) |
|
||||
|
||||
---
|
||||
|
||||
## Replacement Examples
|
||||
|
||||
### MapBox
|
||||
|
||||
```hako
|
||||
// Before:
|
||||
local fns = call("MapBox.get/2", mod_full, "functions")
|
||||
call("MapBox.set/3", map, "key", value)
|
||||
|
||||
// After:
|
||||
local fns = mod_full.get("functions")
|
||||
map.set("key", value)
|
||||
```
|
||||
|
||||
### ArrayBox
|
||||
|
||||
```hako
|
||||
// Before:
|
||||
call("ArrayBox.push/2", insts, MirSchemaBox.inst_const(last_dst, 0))
|
||||
local func = call("ArrayBox.get/2", fns, fi)
|
||||
local count = call("ArrayBox.size/1", arr)
|
||||
|
||||
// After:
|
||||
insts.push(MirSchemaBox.inst_const(last_dst, 0))
|
||||
local func = fns.get(fi)
|
||||
local count = arr.size()
|
||||
```
|
||||
|
||||
### String
|
||||
|
||||
```hako
|
||||
// Before:
|
||||
local sub = call("String.substring/2", s, start, end)
|
||||
local idx = call("String.indexOf/2", repr, "MapBox(")
|
||||
|
||||
// After:
|
||||
local sub = s.substring(start, end)
|
||||
local idx = repr.indexOf("MapBox(")
|
||||
```
|
||||
|
||||
### Environment
|
||||
|
||||
```hako
|
||||
// Before:
|
||||
call("env.local.get/1", "HAKO_GC_POLICY_TICK")
|
||||
call("env.console.log/1", "[GcBox] stats=" + s)
|
||||
call("env.gc.stats/0")
|
||||
|
||||
// After:
|
||||
env.get("HAKO_GC_POLICY_TICK")
|
||||
console.log("[GcBox] stats=" + s)
|
||||
gc.stats()
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## Remaining Patterns
|
||||
|
||||
**Count:** 1 (intentional, should NOT be replaced)
|
||||
|
||||
The only remaining `call()` is a **method definition**, not a builtin call:
|
||||
|
||||
```hako
|
||||
// lang/src/vm/core/extern_iface.hako:7
|
||||
call(name, args) {
|
||||
print("[core/extern] unsupported extern: " + name)
|
||||
return -1
|
||||
}
|
||||
```
|
||||
|
||||
This is a method named `call` and is intentionally kept.
|
||||
|
||||
---
|
||||
|
||||
## Environment Call Replacements
|
||||
|
||||
Additional files were modified to replace environment runtime calls:
|
||||
|
||||
- `lang/src/runtime/gc/gc_box.hako`
|
||||
- `env.gc.*` → `gc.*`
|
||||
- `env.console.log` → `console.log`
|
||||
- `env.local.get` → `env.get`
|
||||
|
||||
- `lang/src/runtime/memory/refcell_box.hako`
|
||||
- `env.local.get/set` → `env.get/set`
|
||||
- `env.console.error` → `console.error`
|
||||
|
||||
- `lang/src/runtime/memory/arc_box.hako`
|
||||
- `env.arc.*` → `arc.*`
|
||||
- `env.local.get` → `env.get`
|
||||
- `env.console.*` → `console.*`
|
||||
|
||||
---
|
||||
|
||||
## Next Steps
|
||||
|
||||
1. ✅ **Test compilation** - Verify no "Unresolved function: 'call'" errors
|
||||
2. ✅ **Run smoke tests** - Ensure functionality is preserved
|
||||
3. 🔄 **Consider other directories** - Apply same replacements if needed:
|
||||
- `lang/tests/`
|
||||
- `apps/`
|
||||
- Other directories outside `lang/src`
|
||||
|
||||
---
|
||||
|
||||
## Technical Details
|
||||
|
||||
### Replacement Strategy
|
||||
|
||||
The replacement was performed using two automated shell scripts:
|
||||
|
||||
1. **Box method replacements** - Replaced MapBox, ArrayBox, String operations
|
||||
2. **Environment call replacements** - Replaced env.*, console.*, gc.*, arc.* calls
|
||||
|
||||
### Patterns Excluded from Replacement
|
||||
|
||||
The following patterns were intentionally **not** replaced:
|
||||
|
||||
- Comments containing `call()`: `// call(...)`
|
||||
- Function names containing `call`: `_call`, `emit_call`, `boxcall`
|
||||
- Method definitions: `call(name, args) {`
|
||||
|
||||
### Verification
|
||||
|
||||
Final verification confirmed:
|
||||
- 279 `.hako` files processed
|
||||
- 1 remaining `call()` (method definition only)
|
||||
- All backup files cleaned up
|
||||
- No syntax errors introduced
|
||||
|
||||
---
|
||||
|
||||
## Conclusion
|
||||
|
||||
The `call()` builtin has been completely eliminated from the `lang/src` directory. All 153 occurrences have been successfully replaced with direct method calls, improving code readability and resolving MIR compilation errors.
|
||||
|
||||
**Report generated:** 2025-11-01
|
||||
**Automated by:** Claude Code Assistant
|
||||
Reference in New Issue
Block a user