Module Name: src
Committed By: rillig
Date: Sat Mar 20 08:54:27 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_c99_init.c d_c99_init.exp
src/usr.bin/xlint/lint1: init.c
Log Message:
lint: fix assertion failure after error in designation
In d_c99_init.c, the initialization of array_with_designator failed.
The designator '.member' from that initialization was not cleaned up
before starting the next initialization.
To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 src/tests/usr.bin/xlint/lint1/d_c99_init.c
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/d_c99_init.exp
cvs rdiff -u -r1.107 -r1.108 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/d_c99_init.c
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.10 src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.11
--- src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.10 Sat Mar 20 08:16:30 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.c Sat Mar 20 08:54:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_init.c,v 1.10 2021/03/20 08:16:30 rillig Exp $ */
+/* $NetBSD: d_c99_init.c,v 1.11 2021/03/20 08:54:27 rillig Exp $ */
# 3 "d_c99_init.c"
/*
@@ -139,7 +139,9 @@ int array_with_designator[] = {
* mean the "outermost initializer". Both GCC 10 and Clang 8 already warn
* about this, so there is no extra work for lint to do.
*/
-// FIXME: assertion failure 'istk->i_type != NULL'
-// struct point scalar_with_several_braces = {};
+struct point scalar_with_several_braces = {
+ {{{3}}}, /*FIXME*//* expect: invalid initializer type int */
+ {{{{4}}}},
+};
// See d_struct_init_nested.c for a more complicated example.
Index: src/tests/usr.bin/xlint/lint1/d_c99_init.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.8 src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.9
--- src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.8 Fri Mar 19 01:02:52 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.exp Sat Mar 20 08:54:27 2021
@@ -3,3 +3,4 @@ d_c99_init.c(23): too many initializers
d_c99_init.c(49): cannot initialize 'pointer to const void' from 'struct any' [185]
d_c99_init.c(66): too many array initializers, expected 3 [173]
d_c99_init.c(131): syntax error 'named member must only be used with struct/union' [249]
+d_c99_init.c(143): invalid initializer type int [176]
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.107 src/usr.bin/xlint/lint1/init.c:1.108
--- src/usr.bin/xlint/lint1/init.c:1.107 Sat Mar 20 08:16:30 2021
+++ src/usr.bin/xlint/lint1/init.c Sat Mar 20 08:54:27 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.107 2021/03/20 08:16:30 rillig Exp $ */
+/* $NetBSD: init.c,v 1.108 2021/03/20 08:54:27 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.107 2021/03/20 08:16:30 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.108 2021/03/20 08:54:27 rillig Exp $");
#endif
#include <stdlib.h>
@@ -411,6 +411,8 @@ initstack_init(void)
initstk = istk->i_enclosing;
free(istk);
}
+ while (namedmem != NULL)
+ designator_shift_name();
debug_enter();
