fix(resolver): share plan SelectedFunc across consumers + route UFCS through selector [stdlib C attempt-2]
Address Phase C review (C-1, C-2): make CallResolver.plan's SelectedFunc the single shared call author consumed by the lower-call sites instead of each re-resolving; route free-fn value-receiver UFCS through the selector in plan so plan typing and lowering pick the same author under a flat same-name collision. Adds regression 0740-modules-flat-same-name-ufcs-typing. Salvaged from a worker killed at the wall during its final gate step; manager verified the gate at ground truth (zig build test exit 0; run_examples 476/0 with 0722-0735 + 0740 ok; m3te ios-sim exit 0).
This commit is contained in:
17
examples/0740-modules-flat-same-name-ufcs-typing.sx
Normal file
17
examples/0740-modules-flat-same-name-ufcs-typing.sx
Normal file
@@ -0,0 +1,17 @@
|
||||
// Regression (issue 0102, Phase C): value-receiver free-function UFCS under a
|
||||
// flat same-name collision must be TYPED as the author lowering dispatches.
|
||||
// a.sx (imported first → first-wins winner) authors `tag -> string`; b.sx
|
||||
// authors its OWN `tag -> s64`. In b.sx, `v.tag()` dispatches b.tag (s64), but
|
||||
// before the fix the call PLAN typed it as a.tag (string, first-wins) — so the
|
||||
// pack-fn `print` boxed the raw s64 110 as a string pointer and dereferenced
|
||||
// 0x6e → segfault. `CallResolver.plan` now selects the SAME author the lowering
|
||||
// call-path binds, so plan-typing and dispatch can't disagree (fix-0102 F2).
|
||||
#import "modules/std.sx";
|
||||
#import "0740-modules-flat-same-name-ufcs-typing/a.sx";
|
||||
#import "0740-modules-flat-same-name-ufcs-typing/b.sx";
|
||||
|
||||
main :: () -> s32 {
|
||||
show_a(); // a-side: own == winner → string, byte-for-byte unchanged
|
||||
show_b(); // b-side: shadow author → s64, typed + dispatched as b.tag
|
||||
0
|
||||
}
|
||||
6
examples/0740-modules-flat-same-name-ufcs-typing/a.sx
Normal file
6
examples/0740-modules-flat-same-name-ufcs-typing/a.sx
Normal file
@@ -0,0 +1,6 @@
|
||||
#import "modules/std.sx";
|
||||
// a.sx authors `tag` returning a string; imported first → first-wins winner.
|
||||
// `show_a`'s `v.tag()` is the caller's OWN author (own == winner → existing UFCS
|
||||
// path, byte-for-byte unchanged): typed AND dispatched as a.tag (string).
|
||||
tag :: (x: s64) -> string { return "a-string"; }
|
||||
show_a :: () { v : s64 = 10; print("a: v.tag() = {}\n", v.tag()); }
|
||||
7
examples/0740-modules-flat-same-name-ufcs-typing/b.sx
Normal file
7
examples/0740-modules-flat-same-name-ufcs-typing/b.sx
Normal file
@@ -0,0 +1,7 @@
|
||||
#import "modules/std.sx";
|
||||
// b.sx authors its OWN `tag` returning s64. `show_b`'s `v.tag()` must be both
|
||||
// dispatched AND typed as b.tag (s64 = 110), not the first-wins winner from a.sx
|
||||
// (string). `print` types each arg from the call plan, so a mistype here boxes
|
||||
// the s64 as a string pointer → segfault before the fix.
|
||||
tag :: (x: s64) -> s64 { return x + 100; }
|
||||
show_b :: () { v : s64 = 10; print("b: v.tag() = {}\n", v.tag()); }
|
||||
@@ -0,0 +1 @@
|
||||
0
|
||||
@@ -0,0 +1 @@
|
||||
|
||||
@@ -0,0 +1,2 @@
|
||||
a: v.tag() = a-string
|
||||
b: v.tag() = 110
|
||||
Reference in New Issue
Block a user