From 70bab06713c1a381554b075e4b94a5eaefa1608b Mon Sep 17 00:00:00 2001 From: rillig Date: Mon, 3 Jul 2023 21:36:16 +0000 Subject: lint: consistently use portable type size in integer constraints Since tree.c 1.546 from 2023-07-03, lint no longer warned about possible loss of accuracy when converting from 'long' to 'int' on an ILP32 platform that uses 'unsigned long' for size_t, when run in portable mode (-p), which is enabled by default in the NetBSD build. The integer constraints avoid false-positive warnings by looking at the actual values an expression can take. The function can_represent is guarded by a condition that uses the portable_size_in_bits, but then internally used the opposite size_in_bits, which led to inconsistent results. The warning looks confusing though, as on an ILP32 platform, 'int' and 'long' have the same size and representation, therefore there cannot be an actual loss of accuracy. The warning may need to be reworded to explicitly mention the portability mode, in which sizeof(int) is assumed to be 3 instead of 4, to catch possible loss of accuracy on other platforms. --- usr.bin/xlint/lint1/tree.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'usr.bin') diff --git a/usr.bin/xlint/lint1/tree.c b/usr.bin/xlint/lint1/tree.c index 17c69fbfe35..c86812ec726 100644 --- a/usr.bin/xlint/lint1/tree.c +++ b/usr.bin/xlint/lint1/tree.c @@ -1,4 +1,4 @@ -/* $NetBSD: tree.c,v 1.546 2023/07/03 07:19:57 rillig Exp $ */ +/* $NetBSD: tree.c,v 1.547 2023/07/03 21:36:16 rillig Exp $ */ /* * Copyright (c) 1994, 1995 Jochen Pohl @@ -37,7 +37,7 @@ #include #if defined(__RCSID) -__RCSID("$NetBSD: tree.c,v 1.546 2023/07/03 07:19:57 rillig Exp $"); +__RCSID("$NetBSD: tree.c,v 1.547 2023/07/03 21:36:16 rillig Exp $"); #endif #include @@ -95,7 +95,7 @@ width_in_bits(const type_t *tp) lint_assert(is_integer(tp->t_tspec)); return tp->t_bitfield ? tp->t_bit_field_width - : size_in_bits(tp->t_tspec); + : portable_size_in_bits(tp->t_tspec); } static bool -- cgit