 @@ -1,32 +1,32 @@
-/*	$NetBSD: queries.c,v 1.27 2024/03/30 19:12:37 rillig Exp $	*/
+/*	$NetBSD: queries.c,v 1.28 2024/04/27 10:08:54 rillig Exp $	*/
 # 3 "queries.c"
 /*
  * Demonstrate the case-by-case queries.  Unlike warnings, queries do not
  * point to questionable code but rather to code that may be interesting to
  * inspect manually on a case-by-case basis.
+ *
  * Possible use cases are:
+ *
  *	Understanding how C works internally, by making the usual arithmetic
  *	conversions visible.
+ *
  *	Finding code that intentionally suppresses a regular lint warning,
  *	such as casts between arithmetic types.
  */
 /* lint1-extra-flags: -q 1,2,3,4,5,6,7,8,9,10 */
-/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19 */
+/* lint1-extra-flags: -q 11,12,13,14,15,16,17,18,19,20 */
 /* lint1-extra-flags: -X 351 */
 typedef unsigned char u8_t;
 typedef unsigned short u16_t;
 typedef unsigned int u32_t;
 typedef unsigned long long u64_t;
 typedef signed char s8_t;
 typedef signed short s16_t;
 typedef signed int s32_t;
 typedef signed long long s64_t;
 typedef float f32_t;
 typedef double f64_t;
 @@ -63,26 +63,28 @@ struct {
 f32_t f32;
 f64_t f64;
 c32_t c32;
 c64_t c64;
 char *str;
 const char *cstr;
 volatile char *vstr;
 void *void_ptr;
 const void *const_void_ptr;
 char *char_ptr;
 int *int_ptr;
 int
 Q1(double dbl)
+{
 	/* expect+1: implicit conversion from floating point 'double' to integer 'int' [Q1] */
 	return dbl;
+}
 int
 Q2(double dbl)
+{
 	/* expect+1: cast from floating point 'double' to integer 'int' [Q2] */
 	return (int)dbl;
 @@ -349,29 +351,29 @@ Q9(int x)
 		return (0, 1);
 	case 6:
 		/* expect+1: comma operator with types 'int' and 'int' [Q12] */
 		return 0, 1;
 	case 7:
 		/* expect+1: implicit conversion from floating point 'double' to integer 'int' [Q1] */
 		return 0.0;
 	case 8:
 		/* expect+2: parenthesized return value [Q9] */
 		/* expect+1: implicit conversion from floating point 'double' to integer 'int' [Q1] */
 		return (0.0);
 	case 9:
 		return
-# 363 "queries.c" 3 4
+# 365 "queries.c" 3 4
 		((void *)0)
-# 365 "queries.c"
+# 367 "queries.c"
 		/* expect+1: warning: illegal combination of integer 'int' and pointer 'pointer to void' [183] */
+		;
 	case 10:
 		/* expect+1: warning: illegal combination of integer 'int' and pointer 'pointer to void' [183] */
 		return (void *)(0);
 	default:
 		return 0;
+	}
+}
 void
 Q10(void)
+{
 @@ -499,20 +501,35 @@ convert_from_integer_to_floating(void)
 	/* expect+1: implicit conversion from integer 'long long' to floating point 'double' [Q19] */
 	f64 = s64;
 	/* expect+1: implicit conversion from integer 'unsigned long long' to floating point 'double' [Q19] */
 	f64 = u64;
 	f32 = 0.0F;
 	f32 = 0.0;
 	f64 = 0.0;
 	f64 = (double)0;
 	f64 = (double)u32;
+}
-/*
+// C allows implicit narrowing conversions from a void pointer to an arbitrary
- * Since queries do not affect the exit status, force a warning to make this
+// object pointer. C++ doesn't allow this conversion since it is narrowing.
- * test conform to the general expectation that a test that produces output
+void
- * exits non-successfully.
+Q20_void_pointer_conversion(void)
  */
-/* expect+1: warning: static variable 'unused' unused [226] */
+	/* expect+1: warning: operands of '=' have incompatible pointer types to 'void' and 'const void' [128] */
-static int unused;
+	void_ptr = const_void_ptr;
 	const_void_ptr = void_ptr;
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
 	int_ptr = void_ptr;
 	/* expect+1: redundant cast from 'pointer to void' to 'pointer to int' before assignment [Q7] */
 	int_ptr = (int *)void_ptr;
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to char' [Q20] */
 	char_ptr = void_ptr;
 	void_ptr = char_ptr;
 	/* expect+1: implicit narrowing conversion from void pointer to 'pointer to int' [Q20] */
 	int_ptr = void_ptr;
 	/* expect+1: warning: illegal combination of 'pointer to int' and 'pointer to char', op '=' [124] */
 	int_ptr = char_ptr;
 	/* expect+1: warning: illegal combination of 'pointer to char' and 'pointer to int', op '=' [124] */
 	char_ptr = int_ptr;
+}

 @@ -1,14 +1,14 @@
-# $NetBSD: t_usage.sh,v 1.19 2024/03/30 17:23:13 rillig Exp $
+# $NetBSD: t_usage.sh,v 1.20 2024/04/27 10:08:54 rillig Exp $
+#
 # Copyright (c) 2023 The NetBSD Foundation, Inc.
 # All rights reserved.
+#
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions
 # are met:
 # 1. Redistributions of source code must retain the above copyright
 #    notice, this list of conditions and the following disclaimer.
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
+#
 @@ -79,33 +79,33 @@ suppress_messages_body()
 atf_test_case 'enable_queries'
 enable_queries_body()
+{
 	printf 'typedef int dummy;\n' > code.c
 	# Query IDs are 1-based.
 	atf_check \
 	    -s 'exit:1' \
 	    -e "inline:lint1: invalid query ID '0'\n" \
 	    "$lint1" -q 0 code.c /dev/null
 	# The largest known query.
 	atf_check \
-	    "$lint1" -q 19 code.c /dev/null
+	    "$lint1" -q 20 code.c /dev/null
 	# Larger than the largest known query.
 	atf_check \
 	    -s 'exit:1' \
-	    -e "inline:lint1: invalid query ID '20'\n" \
+	    -e "inline:lint1: invalid query ID '21'\n" \
-	    "$lint1" -q 20 code.c /dev/null
+	    "$lint1" -q 21 code.c /dev/null
 	# Whitespace is not allowed before a query ID.
 	atf_check \
 	    -s 'exit:1' \
 	    -e "inline:lint1: invalid query ID ' 1'\n" \
 	    "$lint1" -q ' 1' code.c /dev/null
 	# Whitespace is not allowed after a query ID.
 	atf_check \
 	    -s 'exit:1' \
 	    -e "inline:lint1: invalid query ID '1 '\n" \
 	    "$lint1" -q '1 ' code.c /dev/null

 @@ -1,14 +1,14 @@
-/*	$NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $	*/
+/*	$NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: err.c,v 1.240 2024/04/12 05:17:48 rillig Exp $");
+__RCSID("$NetBSD: err.c,v 1.241 2024/04/27 10:08:54 rillig Exp $");
 #endif
 #include <limits.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 bool seen_error;
 bool seen_warning;
 /* number of syntax errors */
 @@ -731,26 +731,27 @@ static const char *queries[] = {
 	"redundant cast from '%s' to '%s' before assignment",		// Q7
 	"octal number '%.*s'",						// Q8
 	"parenthesized return value",					// Q9
 	"chained assignment with '%s' and '%s'",			// Q10
 	"static variable '%s' in function",				// Q11
 	"comma operator with types '%s' and '%s'",			// Q12
 	"redundant 'extern' in function declaration of '%s'",		// Q13
 	"comparison '%s' of 'char' with plain integer %d",		// Q14
 	"implicit conversion from integer 0 to pointer '%s'",		// Q15
 	"'%s' was declared 'static', now non-'static'",			// Q16
 	"invisible character U+%04X in %s",				// Q17
 	"const automatic variable '%s'",				// Q18
 	"implicit conversion from integer '%s' to floating point '%s'",	// Q19
 	"implicit narrowing conversion from void pointer to '%s'",	// Q20
 };
 bool any_query_enabled;		/* for optimizing non-query scenarios */
 bool is_query_enabled[sizeof(queries) / sizeof(queries[0])];
 void
 (query_message)(int query_id, ...)
+{
 	if (!is_query_enabled[query_id])
 		return;
 	va_list ap;

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.635 2024/04/12 05:44:38 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $	*/
 /*
  * Copyright (c) 1994, 1995 Jochen Pohl
  * All Rights Reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -27,27 +27,27 @@
  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #if HAVE_NBTOOL_CONFIG_H
 #include "nbtool_config.h"
 #endif
 #include <sys/cdefs.h>
 #if defined(__RCSID)
-__RCSID("$NetBSD: tree.c,v 1.635 2024/04/12 05:44:38 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.636 2024/04/27 10:08:54 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 typedef struct integer_constraints {
 @@ -1422,26 +1422,32 @@ build_assignment(op_t op, bool sys, tnod
 	if (op == SHLASS && hflag && allow_trad && allow_c90
 	    && portable_rank_cmp(lt, rt) < 0)
 		/* semantics of '%s' change in C90; ... */
 		warning(118, "<<=");
 	if (op != SHLASS && op != SHRASS
 	    && (op == ASSIGN || lt != PTR)
 	    && (lt != rt || (ln->tn_type->t_bitfield && rn->tn_op == CON))) {
 		rn = convert(op, 0, ln->tn_type, rn);
 		rt = lt;
+	}
 	if (is_query_enabled[20]
 	    && lt == PTR && ln->tn_type->t_subt->t_tspec != VOID
 	    && rt == PTR && rn->tn_type->t_subt->t_tspec == VOID)
 		/* implicit narrowing conversion from void ... */
 		query_message(20, type_name(ln->tn_type));
 	if (any_query_enabled && rn->tn_op == CVT && rn->tn_cast &&
 	    types_compatible(ln->tn_type, rn->tn_type, false, false, NULL) &&
 	    is_cast_redundant(rn)) {
 		/* redundant cast from '%s' to '%s' before assignment */
 		query_message(7, type_name(rn->u.ops.left->tn_type),
 		    type_name(rn->tn_type));
+	}
 	return build_op(op, sys, ln->tn_type, ln, rn);
+}
 static tnode_t *
 build_real_imag(op_t op, bool sys, tnode_t *ln)