Module Name: src
Committed By: rillig
Date: Sun Jul 4 08:19:06 UTC 2021
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile c99_bool_strict_suppressed.c
src/usr.bin/xlint/lint1: tree.c
Removed Files:
src/tests/usr.bin/xlint/lint1: c99_bool_strict_suppressed.exp
Log Message:
lint: remove outdated assertion
Since err.c 1.12 from 2000-07-06, lint allows to suppress individual
error messages. Suppressed error messages do not increment nerr.
Keeping nerr at 0 had triggered the assertion.
To generate a diff of this commit:
cvs rdiff -u -r1.1073 -r1.1074 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.75 -r1.76 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.1 -r1.2 \
src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c
cvs rdiff -u -r1.1 -r0 \
src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.exp
cvs rdiff -u -r1.304 -r1.305 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/tests/mi
diff -u src/distrib/sets/lists/tests/mi:1.1073 src/distrib/sets/lists/tests/mi:1.1074
--- src/distrib/sets/lists/tests/mi:1.1073 Sun Jul 4 07:50:53 2021
+++ src/distrib/sets/lists/tests/mi Sun Jul 4 08:19:05 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1073 2021/07/04 07:50:53 rillig Exp $
+# $NetBSD: mi,v 1.1074 2021/07/04 08:19:05 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6108,7 +6108,7 @@
./usr/tests/usr.bin/xlint/lint1/c11_generic_expression.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/c11_generic_expression.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c tests-usr.bin-tests compattestfile,atf
-./usr/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.exp tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.exp tests-obsolete obsolete
./usr/tests/usr.bin/xlint/lint1/c99_init_array.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/c99_init_array.exp tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/c99_init_designator.c tests-usr.bin-tests compattestfile,atf
Index: src/tests/usr.bin/xlint/lint1/Makefile
diff -u src/tests/usr.bin/xlint/lint1/Makefile:1.75 src/tests/usr.bin/xlint/lint1/Makefile:1.76
--- src/tests/usr.bin/xlint/lint1/Makefile:1.75 Sun Jul 4 07:50:53 2021
+++ src/tests/usr.bin/xlint/lint1/Makefile Sun Jul 4 08:19:06 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.75 2021/07/04 07:50:53 rillig Exp $
+# $NetBSD: Makefile,v 1.76 2021/07/04 08:19:06 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 345 # see lint1/err.c
@@ -12,8 +12,6 @@ TESTS_SH= t_integration
FILESDIR= ${TESTSDIR}
FILES+= c11_generic_expression.c
FILES+= c11_generic_expression.exp
-FILES+= c99_bool_strict_suppressed.c
-FILES+= c99_bool_strict_suppressed.exp
FILES+= c99_init_array.c
FILES+= c99_init_array.exp
FILES+= c99_init_designator.c
Index: src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c
diff -u src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c:1.1 src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c:1.2
--- src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c:1.1 Sun Jul 4 07:50:53 2021
+++ src/tests/usr.bin/xlint/lint1/c99_bool_strict_suppressed.c Sun Jul 4 08:19:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: c99_bool_strict_suppressed.c,v 1.1 2021/07/04 07:50:53 rillig Exp $ */
+/* $NetBSD: c99_bool_strict_suppressed.c,v 1.2 2021/07/04 08:19:06 rillig Exp $ */
# 3 "c99_bool_strict_suppressed.c"
/*
@@ -17,8 +17,7 @@
* interaction with the assertion in expr().
*/
-/* lint1-extra-flags: -T */
-/* TODO: -X 107,330,331,332,333 */
+/* lint1-extra-flags: -T -X 107,330,331,332,333 */
/* ARGSUSED */
void
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.304 src/usr.bin/xlint/lint1/tree.c:1.305
--- src/usr.bin/xlint/lint1/tree.c:1.304 Sat Jul 3 20:40:17 2021
+++ src/usr.bin/xlint/lint1/tree.c Sun Jul 4 08:19:06 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: tree.c,v 1.304 2021/07/03 20:40:17 rillig Exp $ */
+/* $NetBSD: tree.c,v 1.305 2021/07/04 08:19:06 rillig Exp $ */
/*
* Copyright (c) 1994, 1995 Jochen Pohl
@@ -37,7 +37,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.304 2021/07/03 20:40:17 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.305 2021/07/04 08:19:06 rillig Exp $");
#endif
#include <float.h>
@@ -3682,9 +3682,7 @@ void
expr(tnode_t *tn, bool vctx, bool tctx, bool dofreeblk, bool is_do_while)
{
- lint_assert(tn != NULL || nerr != 0);
-
- if (tn == NULL) {
+ if (tn == NULL) { /* in case of errors */
expr_free_all();
return;
}
