 @@ -1,63 +1,63 @@
-/*	$NetBSD: msg_162.c,v 1.5 2021/09/05 16:47:24 rillig Exp $	*/
+/*	$NetBSD: msg_162.c,v 1.6 2021/09/05 17:49:55 rillig Exp $	*/
 # 3 "msg_162.c"
 // Test for message: comparison of %s with %s, op %s [162]
 /* lint1-extra-flags: -hp */
 void
 left_unsigned(unsigned int ui)
+{
 	if (ui < -5.0) {
+	}
 	/* expect+1: warning: comparison of unsigned int with negative constant, op < [162] */
 	if (ui < -5) {
+	}
 	/* expect+1: warning: comparison of unsigned int with 0, op < [162] */
 	if (ui < 0) {
+	}
 	/* expect+1: warning: comparison of unsigned int with 0, op >= [162] */
 	if (ui >= 0) {
+	}
-	/* expect+1: warning: comparison of unsigned int with 0, op <= [162] */
+	/* before 2021-09-05: comparison of unsigned int with 0, op <= [162] */
 	if (ui <= 0) {
+	}
+}
 void
 right_unsigned(unsigned int ui)
+{
 	if (-5.0 > ui) {
+	}
 	/* expect+1: warning: comparison of negative constant with unsigned int, op > [162] */
 	if (-5 > ui) {
+	}
 	/* expect+1: warning: comparison of 0 with unsigned int, op > [162] */
 	if (0 > ui) {
+	}
 	/* expect+1: warning: comparison of 0 with unsigned int, op <= [162] */
 	if (0 <= ui) {
+	}
-	/* expect+1: warning: comparison of 0 with unsigned int, op >= [162] */
+	/* before 2021-09-05: comparison of 0 with unsigned int, op >= [162] */
 	if (0 >= ui) {
+	}
+}
 /*
  * Lint does not care about these comparisons, even though they are obviously
  * out of range.
  */
 void
 compare_signed_char(signed char sc)
+{
 	if (sc == -129)
 		return;
 @@ -87,31 +87,38 @@ void take_bool(_Bool);
 void
 compare_operators(unsigned int x)
+{
 	/* expect+1: warning: comparison of unsigned int with negative constant, op < [162] */
 	take_bool(x < -1);
 	/* expect+1: warning: comparison of unsigned int with 0, op < [162] */
 	take_bool(x < 0);
 	take_bool(x < 1);
 	/* expect+1: warning: comparison of unsigned int with negative constant, op <= [162] */
 	take_bool(x <= -1);
 	/*
-	 * XXX: The expression 'x <= 0' is equivalent to 'x < 1', so lint
+	 * Before tree.c 1.379 from 2021-09-05, lint warned about
-	 * should not warn about it, just as it doesn't warn about the
+	 * 'unsigned <= 0' as well as '0 >= unsigned'.  In all cases where
-	 * inverted condition, which is 'x > 0'.
+	 * the programmer knows whether the underlying data type is signed or
 	 * unsigned, it is clearer to express the same thought as
 	 * 'unsigned == 0', but that's a stylistic issue only.
+	 *
 	 * Removing this particular case of the warning is not expected to
 	 * miss any bugs.  The expression 'x <= 0' is equivalent to 'x < 1',
 	 * so lint should not warn about it, just as it doesn't warn about
 	 * the inverted condition, which is 'x > 0'.
 	 */
-	/* expect+1: warning: comparison of unsigned int with 0, op <= [162] */
+	/* before 2021-09-05: comparison of unsigned int with 0, op <= [162] */
 	take_bool(x <= 0);
 	take_bool(x <= 1);
 	/* expect+1: warning: comparison of unsigned int with negative constant, op > [162] */
 	take_bool(x > -1);
 	take_bool(x > 0);
 	take_bool(x > 1);
 	/* expect+1: warning: comparison of unsigned int with negative constant, op >= [162] */
 	take_bool(x >= -1);
 	/* expect+1: warning: comparison of unsigned int with 0, op >= [162] */
 	take_bool(x >= 0);
 	take_bool(x >= 1);

 @@ -1,18 +1,15 @@
 msg_162.c(15): warning: comparison of unsigned int with negative constant, op < [162]
 msg_162.c(19): warning: comparison of unsigned int with 0, op < [162]
 msg_162.c(23): warning: comparison of unsigned int with 0, op >= [162]
 msg_162.c(27): warning: comparison of unsigned int with 0, op <= [162]
 msg_162.c(39): warning: comparison of negative constant with unsigned int, op > [162]
 msg_162.c(43): warning: comparison of 0 with unsigned int, op > [162]
 msg_162.c(47): warning: comparison of 0 with unsigned int, op <= [162]
 msg_162.c(51): warning: comparison of 0 with unsigned int, op >= [162]
 msg_162.c(76): warning: comparison of unsigned char with negative constant, op == [162]
 msg_162.c(92): warning: comparison of unsigned int with negative constant, op < [162]
 msg_162.c(94): warning: comparison of unsigned int with 0, op < [162]
 msg_162.c(98): warning: comparison of unsigned int with negative constant, op <= [162]
-msg_162.c(105): warning: comparison of unsigned int with 0, op <= [162]
+msg_162.c(116): warning: comparison of unsigned int with negative constant, op > [162]
-msg_162.c(109): warning: comparison of unsigned int with negative constant, op > [162]
+msg_162.c(121): warning: comparison of unsigned int with negative constant, op >= [162]
-msg_162.c(114): warning: comparison of unsigned int with negative constant, op >= [162]
+msg_162.c(123): warning: comparison of unsigned int with 0, op >= [162]
-msg_162.c(116): warning: comparison of unsigned int with 0, op >= [162]
+msg_162.c(127): warning: comparison of unsigned int with negative constant, op == [162]
-msg_162.c(120): warning: comparison of unsigned int with negative constant, op == [162]
+msg_162.c(132): warning: comparison of unsigned int with negative constant, op != [162]
 msg_162.c(125): warning: comparison of unsigned int with negative constant, op != [162]

 @@ -1,36 +1,35 @@
-#	$NetBSD: Makefile,v 1.86 2021/09/05 16:36:56 rillig Exp $
+#	$NetBSD: Makefile,v 1.87 2021/09/05 17:49:55 rillig Exp $
 .include <bsd.own.mk>
 PROG=		lint1
 SRCS=		cgram.y \
 		ckbool.c ckctype.c ckgetopt.c debug.c \
 		decl.c emit.c emit1.c err.c func.c init.c inittyp.c lex.c \
 		main1.c mem.c mem1.c oper.c scan.l tree.c tyname.c
 MAN=		lint.7
 YHEADER=
 #DBG=		-g
 #CPPFLAGS+=	-DYYDEBUG=1
 #YFLAGS+=	-v
 #LFLAGS+=	-d
 CWARNFLAGS.clang+=	-Wno-error=implicit-int-float-conversion
 LINTFLAGS+=		-T
 LOBJS.${PROG}+=		${SRCS:M*.y:.y=.ln}
 LOBJS.${PROG}+=		${SRCS:M*.l:.l=.ln}
 LINTFLAGS.scan.c+=	-X 107,126,330,331,332,333	# strict bool mode
 LINTFLAGS.scan.c+=	-X 162		# comparison of 'unsigned <= 0'
 LINTFLAGS.scan.c+=	-X 192,214	# due to suppressed bool errors
 LINTFLAGS.scan.c+=	-X 307		# static variable unused
 CPPFLAGS+=	-DIS_LINT1
 CPPFLAGS+=	-I${.CURDIR}
 CPPFLAGS+=	${DEBUG:D-DDEBUG -DYYDEBUG}
 COPTS.err.c+=	${${ACTIVE_CC} == "clang":? -Wno-format-nonliteral :}
 BINDIR=		/usr/libexec
 CLEANFILES+=	${MAN} ${MAN}.date

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.378 2021/09/05 16:03:55 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.379 2021/09/05 17:49:55 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) && !defined(lint)
-__RCSID("$NetBSD: tree.c,v 1.378 2021/09/05 16:03:55 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.379 2021/09/05 17:49:55 rillig Exp $");
 #endif
 #include <float.h>
 #include <limits.h>
 #include <math.h>
 #include <signal.h>
 #include <stdlib.h>
 #include <string.h>
 #include "lint1.h"
 #include "cgram.h"
 static	tnode_t	*build_integer_constant(tspec_t, int64_t);
 @@ -4222,39 +4222,39 @@ check_integer_comparison(op_t op, tnode_
 	if ((hflag || pflag) && ((lt == CHAR && is_out_of_char_range(rn)) ||
 				 (rt == CHAR && is_out_of_char_range(ln)))) {
 		/* nonportable character comparison, op %s */
 		warning(230, op_name(op));
 		return;
+	}
 	if (is_uinteger(lt) && !is_uinteger(rt) &&
 	    rn->tn_op == CON && rn->tn_val->v_quad <= 0) {
 		if (rn->tn_val->v_quad < 0) {
 			/* comparison of %s with %s, op %s */
 			warning(162, type_name(ln->tn_type),
 			    "negative constant", op_name(op));
-		} else if (op == LT || op == GE || (hflag && op == LE)) {
+		} else if (op == LT || op == GE) {
 			/* comparison of %s with %s, op %s */
 			warning(162, type_name(ln->tn_type), "0", op_name(op));
+		}
 		return;
+	}
 	if (is_uinteger(rt) && !is_uinteger(lt) &&
 	    ln->tn_op == CON && ln->tn_val->v_quad <= 0) {
 		if (ln->tn_val->v_quad < 0) {
 			/* comparison of %s with %s, op %s */
 			warning(162, "negative constant",
 			    type_name(rn->tn_type), op_name(op));
-		} else if (op == GT || op == LE || (hflag && op == GE)) {
+		} else if (op == GT || op == LE) {
 			/* comparison of %s with %s, op %s */
 			warning(162, "0", type_name(rn->tn_type), op_name(op));
+		}
 		return;
+	}
+}
 /*
  * Return whether the expression can be used for static initialization.
+ *
  * Constant initialization expressions must be constant or an address
  * of a static object with an optional offset. In the first case,
  * the result is returned in *offsp. In the second case, the static