Hojun-Cho/ww
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

check: stamp a str for-range binding u8 in the wwstage

Browse Source 
cstage types the binding ty_u8; the wwstage single-binder arm peeled
the element only for slice/array iterables, so a str scrutinee fell to
the N_FORRANGE fallback decl and exprtype stamped the binding str.
The stamp-keyed call-arg marshal then pushed the 3-word str ABI for a
1-word scalar, and an uncast compare on the binding was falsely
rejected. Route str through the same synthetic-N_LET binder with a u8
element. Graduates r940_str_forrange_arg.
This commit is contained in:
Hojun-Cho
2026-08-07 23:52:08 +09:00
parent c717facf78
commit 06c20dbec4
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile
View File

@@ -584,8 +584,7 @@ DATABYTEID_EXPECTED_MIN = 911
# this list rather than silently widening coverage. Tracked with the #59
# divergence family.
DATABYTEID_DIVERGED = r76_typeeq_fn_diff_arity r76_typeeq_fn_diff_param_type \
r76_typeeq_fn_io_vtable_shape r76_typeeq_fn_variadic_vs_fixed \
r940_str_forrange_arg
r76_typeeq_fn_io_vtable_shape r76_typeeq_fn_variadic_vs_fixed
$(if $(DATABYTEID_FILES),,$(error test-byteid: empty data corpus))
test-data-byteid: $(BIN)/ww $(BIN)/w6c $(BIN)/w6c_ww
@work=$$(mktemp -d "$(CURDIR)/$(DATABYTEID_DIR).XXXXXX") || exit 1; \

14
selfhost/cmd/wcc/check.ww
View File

@@ -584,9 +584,7 @@ fn resolvewalk(c: *checker, n: *syntax.node) void = {
// types it: check.c N_FORRANGE scope_define(...,
// elem, ...)). Synthetic N_LET binder whose .lhs
// is the element tnode — the stamptuplebinds
// `b.lhs = et` idiom. A str scrutinee keeps the
// old decl: cgen synthesises the u8 elem there
// and no dot applies to a u8 binding.
// `b.lhs = et` idiom.
let et: *syntax.node = nil;
let it: *syntax.node = exprtype(c, n.lhs, nil);
// #80 (F2a batch-4 c4): an alias-typed iterable
@@ -599,6 +597,16 @@ fn resolvewalk(c: *checker, n: *syntax.node) void = {
if (it != nil) {
if (it.kind == syntax.nkind.N_TSLICE) { et = it.lhs; };
if (it.kind == syntax.nkind.N_TARRAY) { et = it.lhs; };
// A str binding is u8 (cstage check.c: elem =
// ty_u8). The old N_FORRANGE fallback decl made
// exprtype stamp the binding str, so call-arg
// marshaling pushed the 3-word str ABI for a
// 1-word scalar.
if (it.kind == syntax.nkind.N_TNAME) {
if (syntax.streq(it.str, "str")) {
et = mktname(c, "u8");
};
};
};
if (et != nil) {
let bn: *syntax.node = syntax.newnode(syntax.nkind.N_LET, n.file, n.line, n.col);