Module Name: src
Committed By: rillig
Date: Mon Jul 3 21:36:16 UTC 2023
Modified Files:
src/tests/usr.bin/xlint/lint1: platform_ilp32_long.c
src/usr.bin/xlint/lint1: tree.c
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c
cvs rdiff -u -r1.546 -r1.547 src/usr.bin/xlint/lint1/tree.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c
diff -u src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c:1.2 src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c:1.3
--- src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c:1.2 Tue Mar 28 14:44:35 2023
+++ src/tests/usr.bin/xlint/lint1/platform_ilp32_long.c Mon Jul 3 21:36:16 2023
@@ -1,4 +1,4 @@
-/* $NetBSD: platform_ilp32_long.c,v 1.2 2023/03/28 14:44:35 rillig Exp $ */
+/* $NetBSD: platform_ilp32_long.c,v 1.3 2023/07/03 21:36:16 rillig Exp $ */
# 3 "platform_ilp32_long.c"
/*
@@ -30,6 +30,7 @@ convert_between_int_and_long(void)
/* expect+1: warning: conversion from 'long' to 'int' may lose accuracy [132] */
s32 = sl32;
sl32 = s32;
+ /* expect+1: warning: conversion from 'unsigned long' to 'unsigned int' may lose accuracy [132] */
u32 = ul32;
ul32 = u32;
}
Index: src/usr.bin/xlint/lint1/tree.c
diff -u src/usr.bin/xlint/lint1/tree.c:1.546 src/usr.bin/xlint/lint1/tree.c:1.547
--- src/usr.bin/xlint/lint1/tree.c:1.546 Mon Jul 3 07:19:57 2023
+++ src/usr.bin/xlint/lint1/tree.c Mon Jul 3 21:36:16 2023
@@ -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 <sys/cdefs.h>
#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 <float.h>
@@ -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
