 @@ -1,14 +1,14 @@
-/*	$NetBSD: msg_132.c,v 1.39 2024/05/01 05:38:11 rillig Exp $	*/
+/*	$NetBSD: msg_132.c,v 1.40 2024/05/01 05:49:33 rillig Exp $	*/
 # 3 "msg_132.c"
 // Test for message: conversion from '%s' to '%s' may lose accuracy [132]
 /* lint1-extra-flags: -X 351 */
 /*
  * NetBSD's default lint flags only include a single -a, which only flags
  * narrowing conversions from long.  To get warnings for all narrowing
  * conversions, -a needs to be given more than once.
+ *
  * https://gnats.netbsd.org/14531
  */
 @@ -255,33 +255,33 @@ test_ic_shr(u64_t x)
 	 * No matter whether the big integer is signed or unsigned, the
 	 * result of '&' is guaranteed to be an unsigned value.
 	 */
 	u8 = (s64 & 0xf0) >> 4;
 	u8 = (s8 & 0xf0) >> 4;
 	/* expect+1: warning: conversion from 'unsigned long long' to 'unsigned int' may lose accuracy [132] */
 	return x;
+}
 unsigned char
 test_bit_fields(unsigned long long m)
+{
-	/* expect+1: warning: conversion from 'unsigned long long:32' to 'unsigned int:3' may lose accuracy [132] */
+	/* expect+1: warning: conversion from 'unsigned long long' to 'unsigned int:3' may lose accuracy [132] */
 	bits.u3 = bits.u32 & m;
 	bits.u5 = bits.u3 & m;
 	bits.u32 = bits.u5 & m;
-	/* expect+1: warning: conversion from 'unsigned long long:32' to 'unsigned char' may lose accuracy [132] */
+	/* expect+1: warning: conversion from 'unsigned long long' to 'unsigned char' may lose accuracy [132] */
 	return bits.u32 & m;
+}
 /*
  * Traditional C has an extra rule that the right-hand operand of a bit shift
  * operator is converted to 'int'.  Before tree.c 1.467 from 2022-07-02, this
  * conversion was implemented as a CVT node, which means a cast, not an
  * implicit conversion.  Changing the CVT to NOOP would have caused a wrong
  * warning 'may lose accuracy' in language levels other than traditional C.
  */
 u64_t
 u64_shl(u64_t lhs, u64_t rhs)
 @@ -440,16 +440,17 @@ binary_operators_on_bit_fields(void)
 	struct {
 		u64_t u15:15;
 		u64_t u48:48;
 		u64_t u64;
 	} s = { 0, 0, 0 };
 	u64 = s.u15 | s.u48;
 	u64 = s.u48 | s.u15;
 	u64 = s.u15 | s.u48 | s.u64;
 	u64 = s.u64 | s.u48 | s.u15;
 	cond = (s.u15 | s.u48 | s.u64) != 0;
 	cond = (s.u64 | s.u48 | s.u15) != 0;
-	/* expect+1: warning: conversion of 'int' to 'int:4' is out of range [119] */
+	// Before tree.c from 1.638 from 2024-05-01, lint wrongly warned:
 	// warning: conversion of 'int' to 'int:4' is out of range [119]
 	s32 = 8 - bits.u3;
+}

 @@ -1,14 +1,14 @@
-/*	$NetBSD: tree.c,v 1.637 2024/04/27 12:46:37 rillig Exp $	*/
+/*	$NetBSD: tree.c,v 1.638 2024/05/01 05:49:33 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.637 2024/04/27 12:46:37 rillig Exp $");
+__RCSID("$NetBSD: tree.c,v 1.638 2024/05/01 05:49:33 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 {
 @@ -753,32 +753,34 @@ balance(op_t op, tnode_t **lnp, tnode_t
 	tspec_t rt = (*rnp)->tn_type->t_tspec;
 	if (!is_arithmetic(lt) || !is_arithmetic(rt))
 		return;
 	tspec_t t = allow_c90
 	    ? usual_arithmetic_conversion_c90(lt, rt)
 	    : usual_arithmetic_conversion_trad(lt, rt);
 	if (t != lt)
 		*lnp = apply_usual_arithmetic_conversions(op, *lnp, t);
 	if (t != rt)
 		*rnp = apply_usual_arithmetic_conversions(op, *rnp, t);
-	unsigned lw = (*lnp)->tn_type->t_bit_field_width;
+	if (is_integer(t)) {
-	unsigned rw = (*rnp)->tn_type->t_bit_field_width;
+		unsigned lw = width_in_bits((*lnp)->tn_type);
-	if (lw < rw)
+		unsigned rw = width_in_bits((*rnp)->tn_type);
-		*lnp = convert(NOOP, 0, (*rnp)->tn_type, *lnp);
+		if (lw < rw)
-	if (rw < lw)
+			*lnp = convert(NOOP, 0, (*rnp)->tn_type, *lnp);
-		*rnp = convert(NOOP, 0, (*lnp)->tn_type, *rnp);
+		if (rw < lw)
 			*rnp = convert(NOOP, 0, (*lnp)->tn_type, *rnp);
+	}
+}
 static tnode_t *
 build_address(bool sys, tnode_t *tn, bool force)
+{
 	tspec_t t;
 	if (!force && ((t = tn->tn_type->t_tspec) == ARRAY || t == FUNC)) {
 		if (!allow_c90)
 			/* '&' before array or function: ignored */
 			warning(127);
 		return tn;
+	}