/* * 989_trycallcollide_run (#11a, c3) — exprtypeoftry must prefer the current * module's symbol when typing a `?`/`!` operand whose bare leaf collides with * a same-leaf decl in a later module. * * THE BUG (review item #11, 2026-06-11): exprtypeoftry (check.ww ~5850 N_IDENT, * ~5874 N_CALL bare-leaf callee) typed the try operand with bare scopelookup — * no (name,module) preference. scopedefineinmodule PREPENDS, so a later * module's same-leaf decl heads the chain and the operand is typed against ITS * signature. For `op()?` the wrong op's error subset is then checked against * the enclosing fn's return: a spurious "?: error variant not in enclosing * return" rejects valid code (or, with a narrower foreign subset, silently * skips the F8 multi-success reject). cstage types the operand via cexpr with * cur_mod. THE FIX: both arms use scopelookupprefer(c.cur, c.curmod, ...), * mirroring exprtype's own N_IDENT/N_CALL arms (:2897/:3336). * * GATING NOTE: this swap broke 995_self_rebuild once in a CONTAMINATED earlier * attempt (bundled with a u64-guard-buggy scopelookuptype). Re-probed clean * atop c1 (i32-correct scopelookuptype): repro closes AND 990-997/995 green. * * row | shape | run (cs==ww) * -----------+---------------------------------------------+------------- * callcollide| beta.user() does `op()?`; gamma also has | 42 (was ww * | `op` with a wider error subset | build-fail) * noclash | same, gamma.op renamed (no collision) | 42 (control) * * The N_DOT-callee module-keyed resolution stays task #51 (out of scope). * Single-file multi-package source is the sanctioned shape (cmd/ww/main.c). */ #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[] = { { "callcollide", "package beta;\n" "export type berr = !void;\n" "export fn op() (i32 | berr) = { return 5; };\n" "export fn user() (i32 | berr) = {\n" " let v: i32 = op()?;\n" " return v + 37;\n" "};\n" "package gamma;\n" "export type gerr1 = !void;\n" "export type gerr2 = !u8;\n" "export fn op() (i32 | gerr1 | gerr2) = { return 0; };\n" "package main;\n" "import beta;\n" "import gamma;\n" "fn main() int = {\n" " match (beta.user()) {\n" " case let n: i32 => return n: int;\n" " case berr => return 99;\n" " };\n" "};\n", 42 }, { "noclash", "package beta;\n" "export type berr = !void;\n" "export fn op() (i32 | berr) = { return 5; };\n" "export fn user() (i32 | berr) = {\n" " let v: i32 = op()?;\n" " return v + 37;\n" "};\n" "package gamma;\n" "export type gerr1 = !void;\n" "export fn other() (i32 | gerr1) = { return 0; };\n" "package main;\n" "import beta;\n" "import gamma;\n" "fn main() int = {\n" " match (beta.user()) {\n" " case let n: i32 => return n: int;\n" " case berr => return 99;\n" " };\n" "};\n", 42 }, }; static int run_build(const char *driver, const struct row *r, int i) { char src[64], tmpdir[64], cmd[1024]; snprintf(src, sizeof src, "/tmp/tcc_%d_%d.ww", getpid(), i); snprintf(tmpdir, sizeof tmpdir, "/tmp/tcc_%d_d_%d", getpid(), i); FILE *f = fopen(src, "wb"); if (!f) return -2; fputs(r->src, f); fclose(f); mkdir(tmpdir, 0755); snprintf(cmd, sizeof cmd, "cd %s && %s build %s 2>/dev/null", tmpdir, driver, src); int brc = runwait(cmd); const char *base = strrchr(src, '/'); base = base ? base + 1 : src; char outbin[128]; snprintf(outbin, sizeof outbin, "%s/%s", tmpdir, base); char *dot = strrchr(outbin, '.'); if (dot && strcmp(dot, ".ww") == 0) *dot = '\0'; int got = -1; if (brc == 0) got = runwait(outbin); unlink(src); unlink(outbin); rmdir(tmpdir); return brc == 0 ? got : -1; /* -1 == build failed */ } int main(void) { const char *bin = getenv("BIN"); if (!bin) bin = "out/bin"; char absbin[1024]; if (bin[0] != '/') { char cwd[1024]; if (getcwd(cwd, sizeof cwd) == NULL) return 1; snprintf(absbin, sizeof absbin, "%s/%s", cwd, bin); bin = absbin; } char cdrv[1024], wdrv[1024]; snprintf(cdrv, sizeof cdrv, "%s/ww", bin); snprintf(wdrv, sizeof wdrv, "%s/ww_ww", bin); int have_ww = (access(wdrv, X_OK) == 0); int n = (int)(sizeof rows / sizeof rows[0]); int total = 0, fail = 0; for (int i = 0; i < n; i++) { total++; int gc = run_build(cdrv, &rows[i], i); if (gc != rows[i].want) { fprintf(stderr, "trycallcollide[cstage][%s]: got=%d want=%d\n", rows[i].label, gc, rows[i].want); fail++; } if (!have_ww) { fprintf(stderr, "trycallcollide: skip wwstage (no %s)\n", wdrv); continue; } int gw = run_build(wdrv, &rows[i], i); if (gw != gc) { fprintf(stderr, "trycallcollide[%s]: cs=%d != ww=%d " "(exprtypeoftry cross-module try-operand misbind — #11a c3)\n", rows[i].label, gc, gw); fail++; } if (gw != rows[i].want) { fprintf(stderr, "trycallcollide[wwstage][%s]: got=%d want=%d\n", rows[i].label, gw, rows[i].want); fail++; } } if (fail) { fprintf(stderr, "trycallcollide_run: %d/%d checks failed\n", fail, total); return 1; } printf("trycallcollide_run: %d/%d ok\n", total, total); return 0; }