ffi M5.A.next.2a.C: pack if-return — lock in slot-load uninit regression

Follow-up to issue-0045's fix (commit 9e78790). The fix routes
inline-comptime-body `return X;` into a result slot but sets
`block_terminated = true` after the inline return — and that
flag leaks past the enclosing `if`'s merge block.

Body shape:
  maybe :: (..$args) -> s64 {
      if args.len > 0 { return 42; }
      return -1;
  }

For `maybe()` (zero call-args), the false-condition path skips
the then-branch's `return 42;` and should fall through to
`return -1;`. Today's flow:

  - Then-branch's `return 42;` stores 42 to slot and sets
    block_terminated = true.
  - if lowering switches to merge_bb. block_terminated stays
    true (never reset across the if/merge boundary).
  - lowerBlockValue's loop sees block_terminated and returns
    null without processing the trailing `return -1;`.
  - lowerComptimeCall loads slot — slot was never written on
    the false-condition path → garbage (8354116000 on this
    machine; stable across runs).

`maybe(99)` works because the cond is true; the then-branch's
store wins.

Next commit reshapes the inline-return mechanism to use a
dedicated "return-done" basic block: each inline `return X;`
stores to slot and branches to ret_done; after the body
lowers, lowerComptimeCall switches to ret_done and loads. The
basic block CFG carries the control-flow termination — no
need for the leaking `block_terminated` flag.

196/196 example tests + `zig build test` green (the new test
captures the wrong value as the snapshot to flip).
This commit is contained in:
agra
2026-05-27 14:52:43 +03:00
parent 83c2c9d176
commit 6b7a66ba4d
3 changed files with 42 additions and 0 deletions

View File

@@ -0,0 +1 @@
0

View File

@@ -0,0 +1,2 @@
8354116000
42