Module Name: src
Committed By: rillig
Date: Thu Mar 25 22:53:05 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_168.c msg_168.exp
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: fix initialization for arrays with designators
>From the previous commit, there was an off-by-one error left, which was
due to the interaction between designation_add_subscript and
extend_if_array_of_unknown_size.
The other crucial point was to call initstack_pop_nobrace before
accessing the "current initialization stack element". Without this
call, in msg_168.c the "current element" would point to the initializer
level for 'const char *' instead of the one for 'array of const char *'.
One more step towards supporting C99.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/tests/usr.bin/xlint/lint1/msg_168.c \
src/tests/usr.bin/xlint/lint1/msg_168.exp
cvs rdiff -u -r1.132 -r1.133 src/usr.bin/xlint/lint1/init.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/msg_168.c
diff -u src/tests/usr.bin/xlint/lint1/msg_168.c:1.4 src/tests/usr.bin/xlint/lint1/msg_168.c:1.5
--- src/tests/usr.bin/xlint/lint1/msg_168.c:1.4 Thu Mar 25 22:15:38 2021
+++ src/tests/usr.bin/xlint/lint1/msg_168.c Thu Mar 25 22:53:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_168.c,v 1.4 2021/03/25 22:15:38 rillig Exp $ */
+/* $NetBSD: msg_168.c,v 1.5 2021/03/25 22:53:05 rillig Exp $ */
# 3 "msg_168.c"
// Test for message: array subscript cannot be > %d: %ld [168]
@@ -37,6 +37,6 @@ array_with_c99_initializer(void)
['9'] = "IX"
};
- print_string(to_roman['9']); /*FIXME*//* expect: 168 */
+ print_string(to_roman['9']);
print_string(to_roman[':']); /* expect: 168 */
}
Index: src/tests/usr.bin/xlint/lint1/msg_168.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_168.exp:1.4 src/tests/usr.bin/xlint/lint1/msg_168.exp:1.5
--- src/tests/usr.bin/xlint/lint1/msg_168.exp:1.4 Thu Mar 25 22:15:38 2021
+++ src/tests/usr.bin/xlint/lint1/msg_168.exp Thu Mar 25 22:53:05 2021
@@ -1,3 +1,2 @@
msg_168.c(28): warning: array subscript cannot be > 19: 20 [168]
-msg_168.c(40): warning: array subscript cannot be > 51: 57 [168]
-msg_168.c(41): warning: array subscript cannot be > 51: 58 [168]
+msg_168.c(41): warning: array subscript cannot be > 57: 58 [168]
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.132 src/usr.bin/xlint/lint1/init.c:1.133
--- src/usr.bin/xlint/lint1/init.c:1.132 Thu Mar 25 22:15:38 2021
+++ src/usr.bin/xlint/lint1/init.c Thu Mar 25 22:53:05 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.132 2021/03/25 22:15:38 rillig Exp $ */
+/* $NetBSD: init.c,v 1.133 2021/03/25 22:53:05 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: init.c,v 1.132 2021/03/25 22:15:38 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.133 2021/03/25 22:53:05 rillig Exp $");
#endif
#include <stdlib.h>
@@ -497,6 +497,9 @@ designation_add_name(sbuf_t *sb)
debug_designation();
}
+/* TODO: Move the function body up here, to avoid the forward declaration. */
+static void initstack_pop_nobrace(void);
+
/*
* A sub-object of an array is initialized using a designator. This does not
* have to be an array element directly, it can also be used to initialize
@@ -523,9 +526,12 @@ designation_add_subscript(range_t range)
debug_step("subscript range is %zu ... %zu", range.lo, range.hi);
debug_initstack();
+ initstack_pop_nobrace();
+
istk = initstk_lvalue;
if (istk->i_array_of_unknown_size) {
- int auto_dim = (int)(range.hi + 1);
+ /* No +1 here, extend_if_array_of_unknown_size will add it. */
+ int auto_dim = (int)range.hi;
if (auto_dim > istk->i_type->t_dim) {
debug_step("setting the array size to %d", auto_dim);
istk->i_type->t_dim = auto_dim;
@@ -734,6 +740,11 @@ extend_if_array_of_unknown_size(void)
if (istk->i_remaining != 0)
return;
+ /*
+ * XXX: According to the function name, there should be a 'return' if
+ * i_array_of_unknown_size is false. There's probably a test missing
+ * for that case.
+ */
/*
* The only place where an incomplete array may appear is at the
@@ -1292,11 +1303,6 @@ init_array_using_string(tnode_t *tn)
len = strg->st_len;
if (istk->i_array_of_unknown_size) {
- /*
- * FIXME: C99 6.7.8p22 explicitly says that only "at the end
- * of its initializer list, the array no longer has incomplete
- * type".
- */
istk->i_array_of_unknown_size = false;
istk->i_type->t_dim = len + 1;
setcomplete(istk->i_type, true);
