wcc/ww: def-dim array .len field-reads resolve the dimension from the type table
buf.len on a [MAX]u8 returned 0 — the cgdot len arms (local/global/ def) and letemitsize only read an N_INTLIT dimension. Route a non-literal dimension through tichase().alen (the #21 fix mirrored into the field-read consumers; .ptr arms are dim-independent). Review-era task #56.
This commit is contained in:
170
test/wcc/989_defdim_field_run.c
Normal file
170
test/wcc/989_defdim_field_run.c
Normal file
@@ -0,0 +1,170 @@
|
||||
/*
|
||||
* 989_defdim_field_run (#56) — `.len` field-read on an array whose dimension
|
||||
* is a `def` constant (`[MAX]T`) must resolve the length from the type table,
|
||||
* the cgdot sibling of the #21 cgslice fix.
|
||||
*
|
||||
* THE BUG (wwstage only): the cgdot `.len` arms (local / let-global / def) and
|
||||
* letemitsize read the array dimension straight off the AST tnode and only
|
||||
* handled an N_INTLIT dim. A `def MAX` dim arrives as a non-literal node, so
|
||||
* `.len` folded to MOVQ $0 (ww returned 0 where cstage returns the resolved
|
||||
* length). cstage reads the resolved bu->alen. THE FIX: when the dim is not an
|
||||
* N_INTLIT node, read the length from the stamped array tinfo (rule-13), in
|
||||
* each of the local/global/def cgdot arms + letemitsize.
|
||||
*
|
||||
* row | shape | exit (cs==ww)
|
||||
* --------+----------------------------------------+--------------
|
||||
* local | def MAX=5; let buf:[MAX]u8; buf.len | 5 (was ww 0)
|
||||
* global | def MAX=5; let g:[MAX]u8; g.len | 5 (was ww 0)
|
||||
* defarr | def MAX=5; def A:[MAX]u8; A.len | 5 (was ww 0)
|
||||
* sum | local + global + def .len (one fn) | 15
|
||||
*/
|
||||
#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[] = {
|
||||
{ "local",
|
||||
"package main;\n"
|
||||
"def MAX: i32 = 5;\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" let buf: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
" return buf.len: i32;\n"
|
||||
"};\n",
|
||||
5 },
|
||||
|
||||
{ "global",
|
||||
"package main;\n"
|
||||
"def MAX: i32 = 5;\n"
|
||||
"let g: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" return g.len: i32;\n"
|
||||
"};\n",
|
||||
5 },
|
||||
|
||||
{ "defarr",
|
||||
"package main;\n"
|
||||
"def MAX: i32 = 5;\n"
|
||||
"def A: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" return A.len: i32;\n"
|
||||
"};\n",
|
||||
5 },
|
||||
|
||||
{ "sum",
|
||||
"package main;\n"
|
||||
"def MAX: i32 = 5;\n"
|
||||
"let g: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
"def A: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
"export fn main() i32 = {\n"
|
||||
" let buf: [MAX]u8 = [1, 2, 3, 4, 5];\n"
|
||||
" return (buf.len + g.len + A.len): i32;\n"
|
||||
"};\n",
|
||||
15 },
|
||||
};
|
||||
|
||||
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/ddf_%d_%d.ww", getpid(), i);
|
||||
snprintf(tmpdir, sizeof tmpdir, "/tmp/ddf_%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, "defdim_field[cstage][%s]: build/run failed "
|
||||
"(got %d)\n", rows[i].label, gc);
|
||||
fail++;
|
||||
continue;
|
||||
}
|
||||
if (gc != rows[i].want_exit) {
|
||||
fprintf(stderr, "defdim_field[cstage][%s]: exit=%d want=%d\n",
|
||||
rows[i].label, gc, rows[i].want_exit);
|
||||
fail++;
|
||||
}
|
||||
if (!have_ww) {
|
||||
fprintf(stderr, "defdim_field: skip wwstage (no %s)\n", wdrv);
|
||||
continue;
|
||||
}
|
||||
int gw = run_build(wdrv, &rows[i], i);
|
||||
if (gw != gc) {
|
||||
fprintf(stderr, "defdim_field[%s]: cs=%d != ww=%d "
|
||||
"(def-dim .len field-read divergence — #56)\n",
|
||||
rows[i].label, gc, gw);
|
||||
fail++;
|
||||
}
|
||||
if (gw != rows[i].want_exit) {
|
||||
fprintf(stderr, "defdim_field[wwstage][%s]: exit=%d want=%d\n",
|
||||
rows[i].label, gw, rows[i].want_exit);
|
||||
fail++;
|
||||
}
|
||||
}
|
||||
|
||||
if (fail) {
|
||||
fprintf(stderr, "defdim_field_run: %d/%d checks failed\n",
|
||||
fail, total);
|
||||
return 1;
|
||||
}
|
||||
printf("defdim_field_run: %d/%d ok\n", total, total);
|
||||
return 0;
|
||||
}
|
||||
Reference in New Issue
Block a user