Module Name: src
Committed By: rillig
Date: Wed Jan 4 05:25:08 UTC 2023
Modified Files:
src/distrib/sets/lists/tests: mi
src/tests/usr.bin/xlint/lint1: Makefile op_colon.c
Removed Files:
src/tests/usr.bin/xlint/lint1: d_type_question_colon.c
Log Message:
tests/lint: merge tests for ':?' with null pointer constant
To generate a diff of this commit:
cvs rdiff -u -r1.1238 -r1.1239 src/distrib/sets/lists/tests/mi
cvs rdiff -u -r1.129 -r1.130 src/tests/usr.bin/xlint/lint1/Makefile
cvs rdiff -u -r1.3 -r0 src/tests/usr.bin/xlint/lint1/d_type_question_colon.c
cvs rdiff -u -r1.5 -r1.6 src/tests/usr.bin/xlint/lint1/op_colon.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.1238 src/distrib/sets/lists/tests/mi:1.1239
--- src/distrib/sets/lists/tests/mi:1.1238 Thu Dec 1 04:24:37 2022
+++ src/distrib/sets/lists/tests/mi Wed Jan 4 05:25:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1238 2022/12/01 04:24:37 ozaki-r Exp $
+# $NetBSD: mi,v 1.1239 2023/01/04 05:25:08 rillig Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -6511,7 +6511,7 @@
./usr/tests/usr.bin/xlint/lint1/d_type_conv2.exp tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_type_conv3.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_type_conv3.exp tests-obsolete obsolete,atf
-./usr/tests/usr.bin/xlint/lint1/d_type_question_colon.c tests-usr.bin-tests compattestfile,atf
+./usr/tests/usr.bin/xlint/lint1/d_type_question_colon.c tests-obsolete obsolete,atf
./usr/tests/usr.bin/xlint/lint1/d_typefun.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_typename_as_var.c tests-usr.bin-tests compattestfile,atf
./usr/tests/usr.bin/xlint/lint1/d_zero_sized_arrays.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.129 src/tests/usr.bin/xlint/lint1/Makefile:1.130
--- src/tests/usr.bin/xlint/lint1/Makefile:1.129 Tue Jul 5 22:50:41 2022
+++ src/tests/usr.bin/xlint/lint1/Makefile Wed Jan 4 05:25:08 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.129 2022/07/05 22:50:41 rillig Exp $
+# $NetBSD: Makefile,v 1.130 2023/01/04 05:25:08 rillig Exp $
NOMAN= # defined
MAX_MESSAGE= 349 # see lint1/err.c
@@ -86,7 +86,6 @@ FILES+= d_struct_init_nested.c
FILES+= d_type_conv1.c
FILES+= d_type_conv2.c
FILES+= d_type_conv3.c
-FILES+= d_type_question_colon.c
FILES+= d_typefun.c
FILES+= d_typename_as_var.c
FILES+= d_zero_sized_arrays.c
Index: src/tests/usr.bin/xlint/lint1/op_colon.c
diff -u src/tests/usr.bin/xlint/lint1/op_colon.c:1.5 src/tests/usr.bin/xlint/lint1/op_colon.c:1.6
--- src/tests/usr.bin/xlint/lint1/op_colon.c:1.5 Wed Jan 4 05:08:22 2023
+++ src/tests/usr.bin/xlint/lint1/op_colon.c Wed Jan 4 05:25:08 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: op_colon.c,v 1.5 2023/01/04 05:08:22 rillig Exp $ */
+/* $NetBSD: op_colon.c,v 1.6 2023/01/04 05:25:08 rillig Exp $ */
# 3 "op_colon.c"
/*
@@ -55,6 +55,16 @@ test_merge_qualifiers(_Bool cond, int *p
sink(cond ? cv : cv);
}
+/* null pointer constant + other pointer */
+void
+c99_6_5_15_p6(_Bool cond, const volatile double *cv_dp)
+{
+ /* expect+2: ... 'pointer to const volatile double' ... */
+ /* expect+2: ... 'pointer to const volatile double' ... */
+ sink(cond ? cv_dp : (void *)0);
+ sink(cond ? (void *)0 : cv_dp);
+}
+
void
c99_6_5_15_p8(
_Bool cond,
