Module Name: src
Committed By: rillig
Date: Fri Mar 19 01:02:53 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: replace assertion in initialization with proper error message
To generate a diff of this commit:
cvs rdiff -u -r1.8 -r1.9 src/tests/usr.bin/xlint/lint1/d_c99_init.c
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/d_c99_init.exp
cvs rdiff -u -r1.103 -r1.104 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.8 src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.9
--- src/tests/usr.bin/xlint/lint1/d_c99_init.c:1.8 Thu Mar 18 22:51:32 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.c Fri Mar 19 01:02:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_c99_init.c,v 1.8 2021/03/18 22:51:32 rillig Exp $ */
+/* $NetBSD: d_c99_init.c,v 1.9 2021/03/19 01:02:52 rillig Exp $ */
# 3 "d_c99_init.c"
/*
@@ -128,8 +128,7 @@ struct point point_with_mixed_designator
int array_with_designator[] = {
111,
- // FIXME: assertion failure '== STRUCT'
- // .member = 222,
+ .member = 222, /* expect: 249 */
333,
};
Index: src/tests/usr.bin/xlint/lint1/d_c99_init.exp
diff -u src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.7 src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.8
--- src/tests/usr.bin/xlint/lint1/d_c99_init.exp:1.7 Thu Mar 18 21:26:56 2021
+++ src/tests/usr.bin/xlint/lint1/d_c99_init.exp Fri Mar 19 01:02:52 2021
@@ -2,3 +2,4 @@ d_c99_init.c(22): invalid initializer ty
d_c99_init.c(23): too many initializers [174]
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]
Index: src/usr.bin/xlint/lint1/init.c
diff -u src/usr.bin/xlint/lint1/init.c:1.103 src/usr.bin/xlint/lint1/init.c:1.104
--- src/usr.bin/xlint/lint1/init.c:1.103 Fri Mar 19 00:55:02 2021
+++ src/usr.bin/xlint/lint1/init.c Fri Mar 19 01:02:52 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: init.c,v 1.103 2021/03/19 00:55:02 rillig Exp $ */
+/* $NetBSD: init.c,v 1.104 2021/03/19 01:02:52 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.103 2021/03/19 00:55:02 rillig Exp $");
+__RCSID("$NetBSD: init.c,v 1.104 2021/03/19 01:02:52 rillig Exp $");
#endif
#include <stdlib.h>
@@ -436,8 +436,14 @@ initstack_pop_item_named_member(void)
debug_step("initializing named member '%s'", namedmem->n_name);
- lint_assert(istk->i_type->t_tspec == STRUCT ||
- istk->i_type->t_tspec == UNION);
+ if (istk->i_type->t_tspec != STRUCT &&
+ istk->i_type->t_tspec != UNION) {
+ /* syntax error '%s' */
+ error(249, "named member must only be used with struct/union");
+ initerr = true;
+ return;
+ }
+
for (m = istk->i_type->t_str->sou_first_member;
m != NULL; m = m->s_next) {
