8e21cc5f73
The closure trampoline's env-buffer heap-copy in `lowerLambda` used to
call `.heap_alloc` directly (libc malloc, no protocol). Now it routes
through `allocViaContext` like every other compiler-internal alloc,
so a closure created inside `push Context.{ allocator = ... }` honors
the installed allocator — trackers count the env, arenas absorb it,
custom allocators see it. Closes the last `.heap_alloc` shortcut for
sx-internal allocations.
One ordering subtlety fixed alongside: the deferred restore of
`current_ctx_ref` at lowerLambda exit fired AFTER the env-and-closure
build section, so `allocViaContext` was reading `Ref.fromIndex(0)`
(the lambda's own ctx param, only valid inside the lambda body) when
emitting the alloc in the CALLER's scope. Without the explicit
restore, the env_heap dispatch silently routed through the default
context — the captured tracker never saw it. Fixed by restoring
`current_ctx_ref` right after `self.builder.func = saved_func`, before
the env build.
Regression test: `examples/133-closure-env-routes-through-context-allocator.sx`
mirrors the 130-xx-value pattern — install a Tracer via `push Context`,
create a capturing closure inside, assert `Tracer.count = 1`. Without
the fix the count is 0 (env goes through default context). Verified
by stashing the lower.zig change and re-running.
Bonus: `examples/50-smoke.sx` "closure-gpa" output flips from
`allocs=-1` to `allocs=0`. The old `-1` was the bug's signature —
the test manually `dealloc`'d the env after the closure ran, but the
GPA had never seen the matching alloc, so its counter went negative.
With Phase 1.3 the alloc/dealloc balance at 0. Snapshot regen.
155/155 example tests pass (133 new + 50-smoke regen). Chess green on
macOS / iOS sim / Android.
48 lines
1.5 KiB
Plaintext
48 lines
1.5 KiB
Plaintext
// Phase 1.3 — the closure env-buffer heap-copy in `lowerLambda` must
|
|
// dispatch through `context.allocator`, not `.heap_alloc` directly.
|
|
// So when a `push Context.{ allocator = tracer }` block is active, a
|
|
// capturing closure created inside it MUST allocate its env through
|
|
// the tracker.
|
|
//
|
|
// Mirrors the shape of `130-xx-value-routes-through-context-allocator.sx`
|
|
// for the protocol-erasure heap path — same Tracer, same install via
|
|
// `push Context`, same `Tracer.count = 1` assertion. Different
|
|
// allocation site (closure env vs xx-value heap copy).
|
|
|
|
#import "modules/std.sx";
|
|
|
|
Tracer :: struct {
|
|
count: s64;
|
|
|
|
init :: () -> *Tracer {
|
|
t : *Tracer = xx libc_malloc(size_of(Tracer));
|
|
t.count = 0;
|
|
t;
|
|
}
|
|
}
|
|
|
|
impl Allocator for Tracer {
|
|
alloc :: (self: *Tracer, size: s64) -> *void {
|
|
self.count += 1;
|
|
return libc_malloc(size);
|
|
}
|
|
dealloc :: (self: *Tracer, ptr: *void) {
|
|
libc_free(ptr);
|
|
}
|
|
}
|
|
|
|
main :: () -> s32 {
|
|
tracer := Tracer.init();
|
|
push Context.{ allocator = xx tracer, data = null } {
|
|
// Capturing closure. lowerLambda allocates an env struct on the
|
|
// stack, copies the captures in, then heap-copies the env via
|
|
// `allocViaContext` — which dispatches through the installed
|
|
// tracer's `alloc`.
|
|
captured : s64 = 100;
|
|
add_capture := closure((y: s64) -> s64 => y + captured);
|
|
_ = add_capture(1);
|
|
}
|
|
print("Tracer.count = {}\n", tracer.count);
|
|
0;
|
|
}
|