ir: auto-deref *Self when invoking a Closure-typed field (issue-0035)
When lowering `self.cb()` from inside a method whose receiver is *Self, the field-access path passed the receiver pointer (not the aggregate) to `structGet`, which then produced `call void undef(ptr undef)` at the LLVM level — undefined at runtime, corrupted adjacent globals when it transferred control to a garbage pointer. Auto-load through the pointer first so structGet receives a real aggregate. Discovered while building the new AndroidPlatform's `run_frame_loop` — calling the stored frame closure as `self.frame_closure()` zeroed out adjacent globals because the undef call jumped into random memory. Added examples/100-closure-field-call-via-self-ptr.sx as the locked-in regression: both direct (`self.cb()`) and hoisted (`fn := self.cb; fn();`) forms must yield identical IR + behavior. 86/86 regression tests pass.
This commit is contained in:
40
examples/100-closure-field-call-via-self-ptr.sx
Normal file
40
examples/100-closure-field-call-via-self-ptr.sx
Normal file
@@ -0,0 +1,40 @@
|
|||||||
|
// Invoking a Closure-typed struct field as `self.field()` from a
|
||||||
|
// method whose receiver is `*Self`. The field access must auto-deref
|
||||||
|
// the pointer before extracting the closure value.
|
||||||
|
|
||||||
|
#import "modules/std.sx";
|
||||||
|
|
||||||
|
Holder :: struct {
|
||||||
|
cb: Closure() = ---;
|
||||||
|
has: bool = false;
|
||||||
|
|
||||||
|
set :: (self: *Holder, fn: Closure()) {
|
||||||
|
self.cb = fn;
|
||||||
|
self.has = true;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Direct invocation through *self.
|
||||||
|
call_direct :: (self: *Holder) {
|
||||||
|
if self.has == false { return; }
|
||||||
|
self.cb();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Hoist-then-call form — must agree with the direct form.
|
||||||
|
call_hoisted :: (self: *Holder) {
|
||||||
|
if self.has == false { return; }
|
||||||
|
fn := self.cb;
|
||||||
|
fn();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
ticks : s32 = 0;
|
||||||
|
|
||||||
|
main :: () -> s32 {
|
||||||
|
h : Holder = .{};
|
||||||
|
h.set(() => { ticks += 1; });
|
||||||
|
|
||||||
|
h.call_direct();
|
||||||
|
h.call_hoisted();
|
||||||
|
|
||||||
|
return ticks;
|
||||||
|
}
|
||||||
@@ -4215,8 +4215,13 @@ pub const Lowering = struct {
|
|||||||
if (f.name == field_name_id and !f.ty.isBuiltin()) {
|
if (f.name == field_name_id and !f.ty.isBuiltin()) {
|
||||||
const fti = self.module.types.get(f.ty);
|
const fti = self.module.types.get(f.ty);
|
||||||
if (fti == .closure) {
|
if (fti == .closure) {
|
||||||
// Extract closure from struct field
|
// structGet requires an aggregate value; if obj is *T, load through it first.
|
||||||
const closure_val = self.builder.structGet(obj, @intCast(fi), f.ty);
|
var agg = obj;
|
||||||
|
const oi = self.module.types.get(obj_ty);
|
||||||
|
if (oi == .pointer) {
|
||||||
|
agg = self.builder.load(obj, oi.pointer.pointee);
|
||||||
|
}
|
||||||
|
const closure_val = self.builder.structGet(agg, @intCast(fi), f.ty);
|
||||||
const owned = self.alloc.dupe(Ref, args.items) catch unreachable;
|
const owned = self.alloc.dupe(Ref, args.items) catch unreachable;
|
||||||
return self.builder.emit(.{ .call_closure = .{ .callee = closure_val, .args = owned } }, fti.closure.ret);
|
return self.builder.emit(.{ .call_closure = .{ .callee = closure_val, .args = owned } }, fti.closure.ret);
|
||||||
}
|
}
|
||||||
|
|||||||
1
tests/expected/100-closure-field-call-via-self-ptr.exit
Normal file
1
tests/expected/100-closure-field-call-via-self-ptr.exit
Normal file
@@ -0,0 +1 @@
|
|||||||
|
2
|
||||||
1
tests/expected/100-closure-field-call-via-self-ptr.txt
Normal file
1
tests/expected/100-closure-field-call-via-self-ptr.txt
Normal file
@@ -0,0 +1 @@
|
|||||||
|
|
||||||
Reference in New Issue
Block a user