wcc/ww: alloc of an alias struct literal chases the alias for size and fill
alloc(alias{...}) keyed the size and field-fill off the syntactic
alias name — it under-allocated and emitted zero field stores. Chase
the alias via structlookupchain to the resolved struct (depth-2
chains verified). The scalar else-branch keeps its pre-existing
benign cs!=ww divergence, surfaced here and deferred as task #57
(site note at the arm). Review item #26.
This commit is contained in:
155
test/wcc/989_allocalias_run.c
Normal file
155
test/wcc/989_allocalias_run.c
Normal file
@@ -0,0 +1,155 @@
|
||||
/*
|
||||
* 989_allocalias_run (#26) — `alloc(T{...})` where T is an alias of a struct
|
||||
* must size + field-fill from the resolved (alias-chased) struct layout.
|
||||
*
|
||||
* THE BUG (wwstage only): cgalloc looked up the struct layout by the literal
|
||||
* head NAME via structlookup, which scans c.structs by name and never matches
|
||||
* an alias. For `type pt = point; alloc(pt{x=1,y=2})` it found nil, kept the
|
||||
* default size 8 (under-alloc for the 16B struct) and skipped the whole
|
||||
* field-store loop — the *pt pointed at uninitialised heap (rc=0, p.x wrong).
|
||||
* cstage sizes from type_default(v->type) and walks u->fields. THE FIX: chase
|
||||
* the alias chain with structlookupchain on the literal's type ref.
|
||||
*
|
||||
* row | shape | exit (cs==ww)
|
||||
* -------------+------------------------------------+--------------
|
||||
* alias | type pt=point; alloc(pt{x=1,y=2}) | 0 (was ww 1)
|
||||
* direct ctrl | alloc(point{x=1,y=2}) | 0
|
||||
* alias returns p.x*0+ok: pre-fix ww exited 1 (p.x != 1, zero-filled heap).
|
||||
*/
|
||||
#include <stdio.h>
|
||||
#include <stdlib.h>
|
||||
#include <string.h>
|
||||
#include <unistd.h>
|
||||
#include <sys/stat.h>
|
||||
#include <sys/wait.h>
|
||||
|
||||
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_exit; };
|
||||
|
||||
static const struct row rows[] = {
|
||||
{ "alias",
|
||||
"package main;\n"
|
||||
"import rt;\n"
|
||||
"type point = struct { x: i64, y: i64 };\n"
|
||||
"type pt = point;\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" let p: *pt = alloc(pt{x=1,y=2})!;\n"
|
||||
" if (p.x != 1) { return 1; };\n"
|
||||
" if (p.y != 2) { return 2; };\n"
|
||||
" return 0;\n"
|
||||
"};\n",
|
||||
0 },
|
||||
|
||||
{ "direct",
|
||||
"package main;\n"
|
||||
"import rt;\n"
|
||||
"type point = struct { x: i64, y: i64 };\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" let p: *point = alloc(point{x=1,y=2})!;\n"
|
||||
" if (p.x != 1) { return 1; };\n"
|
||||
" if (p.y != 2) { return 2; };\n"
|
||||
" return 0;\n"
|
||||
"};\n",
|
||||
0 },
|
||||
};
|
||||
|
||||
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/alal_%d_%d.ww", getpid(), i);
|
||||
snprintf(tmpdir, sizeof tmpdir, "/tmp/alal_%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;
|
||||
}
|
||||
|
||||
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 < 0) {
|
||||
fprintf(stderr, "allocalias[cstage][%s]: build/run failed "
|
||||
"(got %d)\n", rows[i].label, gc);
|
||||
fail++;
|
||||
continue;
|
||||
}
|
||||
if (gc != rows[i].want_exit) {
|
||||
fprintf(stderr, "allocalias[cstage][%s]: exit=%d want=%d\n",
|
||||
rows[i].label, gc, rows[i].want_exit);
|
||||
fail++;
|
||||
}
|
||||
if (!have_ww) {
|
||||
fprintf(stderr, "allocalias: skip wwstage (no %s)\n", wdrv);
|
||||
continue;
|
||||
}
|
||||
int gw = run_build(wdrv, &rows[i], i);
|
||||
if (gw != gc) {
|
||||
fprintf(stderr, "allocalias[%s]: cs=%d != ww=%d "
|
||||
"(alloc(alias{}) under-alloc / zero fields — #26)\n",
|
||||
rows[i].label, gc, gw);
|
||||
fail++;
|
||||
}
|
||||
if (gw != rows[i].want_exit) {
|
||||
fprintf(stderr, "allocalias[wwstage][%s]: exit=%d want=%d\n",
|
||||
rows[i].label, gw, rows[i].want_exit);
|
||||
fail++;
|
||||
}
|
||||
}
|
||||
|
||||
if (fail) {
|
||||
fprintf(stderr, "allocalias_run: %d/%d checks failed\n",
|
||||
fail, total);
|
||||
return 1;
|
||||
}
|
||||
printf("allocalias_run: %d/%d ok\n", total, total);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user