Module Name: src
Committed By: rillig
Date: Sat Jul 10 12:10:40 UTC 2021
Modified Files:
src/tests/usr.bin/xlint/lint1: d_lint_assert.c d_lint_assert.exp
src/usr.bin/xlint/lint1: decl.c
Log Message:
lint: fix assertion failure in declare_argument
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/tests/usr.bin/xlint/lint1/d_lint_assert.c \
src/tests/usr.bin/xlint/lint1/d_lint_assert.exp
cvs rdiff -u -r1.195 -r1.196 src/usr.bin/xlint/lint1/decl.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_lint_assert.c
diff -u src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.3 src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.4
--- src/tests/usr.bin/xlint/lint1/d_lint_assert.c:1.3 Sun Feb 21 09:07:58 2021
+++ src/tests/usr.bin/xlint/lint1/d_lint_assert.c Sat Jul 10 12:10:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: d_lint_assert.c,v 1.3 2021/02/21 09:07:58 rillig Exp $ */
+/* $NetBSD: d_lint_assert.c,v 1.4 2021/07/10 12:10:39 rillig Exp $ */
# 3 "d_lint_assert.c"
/*
@@ -13,3 +13,10 @@ enum {
// near d_lint_assert.c:14
A = +++
}; /* expect: 249 */
+
+/*
+ * Before decl.c 1.196 from 2021-07-10, lint ran into an assertion failure
+ * for 'sym->s_type != NULL' in declare_argument.
+ */
+/* expect+1: warning: old style declaration; add 'int' [1] */
+c(void());
Index: src/tests/usr.bin/xlint/lint1/d_lint_assert.exp
diff -u src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.3 src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.4
--- src/tests/usr.bin/xlint/lint1/d_lint_assert.exp:1.3 Sun Mar 21 20:44:59 2021
+++ src/tests/usr.bin/xlint/lint1/d_lint_assert.exp Sat Jul 10 12:10:39 2021
@@ -1 +1,2 @@
d_lint_assert.c(15): error: syntax error '}' [249]
+d_lint_assert.c(22): warning: old style declaration; add 'int' [1]
Index: src/usr.bin/xlint/lint1/decl.c
diff -u src/usr.bin/xlint/lint1/decl.c:1.195 src/usr.bin/xlint/lint1/decl.c:1.196
--- src/usr.bin/xlint/lint1/decl.c:1.195 Mon Jul 5 19:55:51 2021
+++ src/usr.bin/xlint/lint1/decl.c Sat Jul 10 12:10:39 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: decl.c,v 1.195 2021/07/05 19:55:51 rillig Exp $ */
+/* $NetBSD: decl.c,v 1.196 2021/07/10 12:10:39 rillig Exp $ */
/*
* Copyright (c) 1996 Christopher G. Demetriou. All Rights Reserved.
@@ -38,7 +38,7 @@
#include <sys/cdefs.h>
#if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: decl.c,v 1.195 2021/07/05 19:55:51 rillig Exp $");
+__RCSID("$NetBSD: decl.c,v 1.196 2021/07/10 12:10:39 rillig Exp $");
#endif
#include <sys/param.h>
@@ -2430,7 +2430,9 @@ declare_argument(sym_t *sym, bool initfl
error(52, sym->s_name);
}
- lint_assert(sym->s_type != NULL);
+ if (sym->s_type == NULL) /* for c(void()) */
+ sym->s_type = gettyp(VOID);
+
if ((t = sym->s_type->t_tspec) == ARRAY) {
sym->s_type = derive_type(sym->s_type->t_subt, PTR);
} else if (t == FUNC) {
@@ -2448,7 +2450,7 @@ declare_argument(sym_t *sym, bool initfl
warning(269, sym->s_name);
/*
- * Arguments must have complete types. lengths() prints the needed
+ * Arguments must have complete types. length() prints the needed
* error messages (null dimension is impossible because arrays are
* converted to pointers).
*/
