From e8863971221faba91357310b0c8be0fb2951ef22 Mon Sep 17 00:00:00 2001 From: Michael Forney Date: Fri, 22 Feb 2019 21:28:43 -0800 Subject: Fix size of incomplete array types initialized with strings updatearray takes an index, so was allocating an extra byte. --- init.c | 2 +- tests/initializer-string.c | 4 ++++ tests/initializer-string.qbe | 20 ++++++++++++++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 tests/initializer-string.c create mode 100644 tests/initializer-string.qbe diff --git a/init.c b/init.c index 6cba4b4..ec76ef3 100644 --- a/init.c +++ b/init.c @@ -249,7 +249,7 @@ parseinit(struct scope *s, struct type *t) if (!typecompatible(expr->type->base, base)) error(&tok.loc, "array initializer is string literal with incompatible type"); if (t->incomplete) - updatearray(t, expr->string.size + 1); + updatearray(t, expr->string.size); goto add; } break; diff --git a/tests/initializer-string.c b/tests/initializer-string.c new file mode 100644 index 0000000..c92f897 --- /dev/null +++ b/tests/initializer-string.c @@ -0,0 +1,4 @@ +char x[] = "hello"; +void f(void) { + char y[] = "hello"; +} diff --git a/tests/initializer-string.qbe b/tests/initializer-string.qbe new file mode 100644 index 0000000..ba992da --- /dev/null +++ b/tests/initializer-string.qbe @@ -0,0 +1,20 @@ +export data $x = align 1 { b "hello", z 1, } +export +function $f() { +@start.1 + %.1 =l alloc4 6 +@body.2 + %.2 =l add %.1, 0 + storeb 104, %.2 + %.3 =l add %.1, 1 + storeb 101, %.3 + %.4 =l add %.1, 2 + storeb 108, %.4 + %.5 =l add %.1, 3 + storeb 108, %.5 + %.6 =l add %.1, 4 + storeb 111, %.6 + %.7 =l add %.1, 5 + storeb 0, %.7 + ret +} -- cgit v1.2.3