Allow initializing array with longer strings

5 files changed, 8 insertions, 6 deletions

diff --git a/decl.c b/decl.c
index 1699e3e..5dee645 100644
--- a/decl.c
+++ b/decl.c
@@ -885,7 +885,7 @@ struct declaration *stringdecl(struct expression *expr)
 	if (!d) {
 		d = mkdecl(DECLOBJECT, expr->type, LINKNONE);
 		d->value = mkglobal("string", true);
-		emitdata(d, mkinit(0, expr));
+		emitdata(d, mkinit(0, expr->type->size, expr));
 		*entry = d;
 	}
 	return d;
diff --git a/init.c b/init.c
index bb8ad82..1822645 100644
--- a/init.c
+++ b/init.c
@@ -31,13 +31,13 @@ struct initparser {
 };
 
 struct initializer *
-mkinit(uint64_t offset, struct expression *expr)
+mkinit(uint64_t start, uint64_t end, struct expression *expr)
 {
 	struct initializer *init;
 
 	init = xmalloc(sizeof(*init));
-	init->start = offset;
-	init->end = offset + expr->type->size;
+	init->start = start;
+	init->end = end;
 	init->expr = expr;
 	init->next = NULL;
 
@@ -257,7 +257,7 @@ parseinit(struct scope *s, struct type *t)
 			focus(&p);
 		}
 	add:
-		initadd(&init, mkinit(p.sub->offset, expr));
+		initadd(&init, mkinit(p.sub->offset, p.sub->offset + p.sub->type->size, expr));
 		for (;;) {
 			if (p.sub->type->kind == TYPEARRAY && p.sub->type->incomplete)
 				p.sub->type->incomplete = false;
diff --git a/init.h b/init.h
index 9200e9f..4292e02 100644
--- a/init.h
+++ b/init.h
@@ -9,5 +9,5 @@ struct type;
 struct function;
 struct declaration;
 
-struct initializer *mkinit(uint64_t, struct expression *);
+struct initializer *mkinit(uint64_t, uint64_t, struct expression *);
 struct initializer *parseinit(struct scope *, struct type *);
diff --git a/tests/initializer-long-string.c b/tests/initializer-long-string.c
new file mode 100644
index 0000000..4de06d4
--- /dev/null
+++ b/tests/initializer-long-string.c
@@ -0,0 +1 @@
+char s[4] = "hello";
diff --git a/tests/initializer-long-string.qbe b/tests/initializer-long-string.qbe
new file mode 100644
index 0000000..3aa2f6f
--- /dev/null
+++ b/tests/initializer-long-string.qbe
@@ -0,0 +1 @@
+export data $s = align 1 { b "hell", }