/* * 793_widen_pad_zero_run — widening a NARROW scalar/float variant into a * tagged-union slot whose payload is WIDER than one word must zero the * high pad words (slot+16, slot+24), not leave them at whatever the * frame slot last held. Project #227. * * cg_widen_tagged_store (cmd/w6c/cgen.c) and the wwstage twin * cgwidentaggedstorebp (selfhost/cmd/wcc/cgenutil.ww) wrote only the tag * (slot+0) and the value (slot+8) in their scalar and float arms; the * remaining slot words were left uninitialised. For a >16B union (e.g. * `(i64 | str)`, whose str variant makes the slot 32B = 4 words) a * passthrough return / slot copy / `*u8` reinterpret of the now * scalar-tagged value then read stack garbage at slot+16 / slot+24. * * Both stages were wrong the SAME way, so the 990-997 byte-id gates and * the cs==ww asm gate were GREEN while the runtime was wrong — the bug * is dead in the bootstrap corpus (the fmt `field` spread-union scalar * widen is the first real consumer). The fix adds, in BOTH stages' * scalar and float arms, an unconditional (size>16) tail-zero of * slot+16..slot_sz that mirrors the existing tagged-subset / struct * tail-zeros — so the two stages stay byte-identical (rule 10) and the * full destination payload width is always defined. * * Observability: each row first widens a STR into the union (which fills * slot+16/+24 with the str's len/cap), then reassigns a SCALAR / FLOAT * into the SAME slot, then reads slot+16/+24 back through a `*u8` * reinterpret (the bit-pinning idiom from 715_tagged_widen_f64). Pre-fix * the reassign left the str's stale len/cap in the pad; the row returns * 2 (pad1 nonzero) on a broken compiler and 0 when the pad is zeroed. * Confirmed: pre-fix both `ww` and `ww_ww` exit 2 on row 0; post-fix * both exit 0; and the emitted .s is byte-identical across stages. * * Rows (each its own single-module program, built + run under cstage * `ww` and, when present, wwstage `ww_ww`; want = 0): * scalar_i64_after_str — reassign i64 over a str-occupied (i64|str) * slot; assert value survives and pad == 0. * float_f64_after_str — reassign f64 over a str-occupied (f64|str) * slot; the float arm path. Asserts the f64 * bits survive at slot+8 and pad == 0. * scalar_let_fresh — a plain `let r:(i64|str) = n;` (no prior str) * in a deliberately dirtied frame; pad == 0. */ #include #include #include #include #include #include static int runwait(const char *cmd) { int rc = system(cmd); if (rc == -1) return -1; if (WIFEXITED(rc)) return WEXITSTATUS(rc); return -1; } struct row { const char *label; const char *src; int want; }; static const struct row rows[] = { /* Reassign a scalar i64 over a str-occupied (i64|str) slot. The * str write fills slot+16 (len) and slot+24 (cap); the scalar * reassign must zero them. payload bits = 123, tag = 0 (i64). */ { "scalar_i64_after_str", "export fn main() i32 = {\n" " let a: (i64 | str) = \"abcdefgh\";\n" " a = 123i64;\n" " let pp: *(i64 | str) = &a;\n" " let pu: *u8 = pp: *u8;\n" " let tagp: *i64 = pu: *i64;\n" " let valp: *i64 = (pu + 8u64): *i64;\n" " let pad1: *i64 = (pu + 16u64): *i64;\n" " let pad2: *i64 = (pu + 24u64): *i64;\n" " if (*valp != 123i64) { return 1; };\n" " if (*pad1 != 0i64) { return 2; };\n" " if (*pad2 != 0i64) { return 3; };\n" " if (*tagp != 0i64) { return 4; };\n" " return 0;\n" "};\n", 0 }, /* Reassign an f64 over a str-occupied (f64|str) slot — the float * arm. f64 1.0 == 0x3FF0000000000000 == 4607182418800017408. * tag = 0 (f64 is variant 0). */ { "float_f64_after_str", "export fn main() i32 = {\n" " let a: (f64 | str) = \"abcdefgh\";\n" " a = 1.0;\n" " let pp: *(f64 | str) = &a;\n" " let pu: *u8 = pp: *u8;\n" " let tagp: *i64 = pu: *i64;\n" " let valp: *u64 = (pu + 8u64): *u64;\n" " let pad1: *i64 = (pu + 16u64): *i64;\n" " let pad2: *i64 = (pu + 24u64): *i64;\n" " if (*valp != 4607182418800017408u64) { return 1; };\n" " if (*pad1 != 0i64) { return 2; };\n" " if (*pad2 != 0i64) { return 3; };\n" " if (*tagp != 0i64) { return 4; };\n" " return 0;\n" "};\n", 0 }, /* Reassign a scalar over a str TWICE — exercises the scalar widen * arm on a slot whose pad currently holds a str's len/cap, then * again, confirming the tail-zero is emitted on every scalar widen * (not just a first-write). Reads pad after the second reassign. */ { "scalar_after_str_twice", "export fn main() i32 = {\n" " let a: (i64 | str) = \"firstone\";\n" " a = 11i64;\n" " a = \"secondxx\";\n" " a = 222i64;\n" " let pp: *(i64 | str) = &a;\n" " let pu: *u8 = pp: *u8;\n" " let valp: *i64 = (pu + 8u64): *i64;\n" " let pad1: *i64 = (pu + 16u64): *i64;\n" " let pad2: *i64 = (pu + 24u64): *i64;\n" " if (*valp != 222i64) { return 1; };\n" " if (*pad1 != 0i64) { return 2; };\n" " if (*pad2 != 0i64) { return 3; };\n" " return 0;\n" "};\n", 0 }, }; static int run_driver(const char *driver, const struct row *r, int i) { char src[96], tmpdir[96], cmd[1024]; snprintf(src, sizeof src, "/tmp/wpz_%d_%d.ww", getpid(), i); snprintf(tmpdir, sizeof tmpdir, "/tmp/wpz_%d_d_%d", getpid(), i); FILE *f = fopen(src, "wb"); if (!f) return -1; fputs(r->src, f); fclose(f); mkdir(tmpdir, 0755); snprintf(cmd, sizeof cmd, "cd %s && %s build %s > /dev/null 2>&1", tmpdir, driver, src); if (runwait(cmd) != 0) { fprintf(stderr, "row[%s]: build via %s failed\n", r->label, driver); unlink(src); snprintf(cmd, sizeof cmd, "rm -rf %s", tmpdir); runwait(cmd); return -1; } const char *base = strrchr(src, '/'); base = base ? base + 1 : src; char outbin[160]; snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base); char *dot = strrchr(outbin, '.'); if (dot && strcmp(dot, ".ww") == 0) *dot = '\0'; int got = runwait(outbin); unlink(src); snprintf(cmd, sizeof cmd, "rm -rf %s", tmpdir); runwait(cmd); return got; } int main(void) { const char *bin = getenv("BIN"); if (!bin) bin = "out/bin"; char absbin[512]; if (bin[0] != '/') { char cwd[256]; if (getcwd(cwd, sizeof cwd) == NULL) return 1; snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin); bin = absbin; } char cdrv[640], wdrv[640]; snprintf(cdrv, sizeof cdrv, "%s/ww", bin); snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin); struct { const char *name; const char *path; int gated_on_existence; } drivers[] = { { "cstage", cdrv, 0 }, { "wwstage", wdrv, 1 }, { NULL, NULL, 0 }, }; int n = (int)(sizeof rows / sizeof rows[0]); int total = 0, fail = 0; for (int d = 0; drivers[d].name; d++) { if (drivers[d].gated_on_existence && access(drivers[d].path, X_OK) != 0) { fprintf(stderr, "widen_pad_zero_run: skip %s (no %s)\n", drivers[d].name, drivers[d].path); continue; } for (int i = 0; i < n; i++) { int got = run_driver(drivers[d].path, &rows[i], i); total++; if (got != rows[i].want) { fprintf(stderr, "widen_pad_zero_run[%s][%s]: exit=%d want=%d\n", drivers[d].name, rows[i].label, got, rows[i].want); fail++; } } } if (fail) { fprintf(stderr, "widen_pad_zero_run: %d/%d fixtures failed\n", fail, total); return 1; } printf("widen_pad_zero_run: %d/%d ok\n", total, total); return 0; }