Module Name: src
Committed By: rillig
Date: Wed Apr 20 22:50:56 UTC 2022
Modified Files:
src/tests/usr.bin/xlint/lint1: msg_132.c msg_132.exp
Log Message:
tests/lint: fix test for message 132 to be platform-independent
On i386, the test failed because the warning in line 101 was not
generated. This was because size_t on i386 is unsigned int (see
arch/i386/targparam.h, SIZEOF_TSPEC). The result of the multiplication
had type unsigned int, and message 132 does not trigger for a conversion
from unsigned int to signed int because both types have the same size
(see check_integer_conversion, portable_size_in_bits).
Change the involved type from size_t (which the original code used) to
unsigned long long (which is uint64_t on all platforms supported by
lint), so that the warning is generated on all platforms in the same
way.
To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 src/tests/usr.bin/xlint/lint1/msg_132.c
cvs rdiff -u -r1.6 -r1.7 src/tests/usr.bin/xlint/lint1/msg_132.exp
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/msg_132.c
diff -u src/tests/usr.bin/xlint/lint1/msg_132.c:1.7 src/tests/usr.bin/xlint/lint1/msg_132.c:1.8
--- src/tests/usr.bin/xlint/lint1/msg_132.c:1.7 Tue Apr 19 22:40:13 2022
+++ src/tests/usr.bin/xlint/lint1/msg_132.c Wed Apr 20 22:50:56 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: msg_132.c,v 1.7 2022/04/19 22:40:13 rillig Exp $ */
+/* $NetBSD: msg_132.c,v 1.8 2022/04/20 22:50:56 rillig Exp $ */
# 3 "msg_132.c"
// Test for message: conversion from '%s' to '%s' may lose accuracy [132]
@@ -97,6 +97,6 @@ non_constant_expression(void)
* that the conversion will always succeed.
*/
const int not_a_constant = 8;
- /* expect+1: warning: conversion from 'unsigned long' to 'int' may lose accuracy [132] */
- return sizeof(double) + not_a_constant * sizeof(char *);
+ /* expect+1: warning: conversion from 'unsigned long long' to 'int' may lose accuracy [132] */
+ return not_a_constant * 8ULL;
}
Index: src/tests/usr.bin/xlint/lint1/msg_132.exp
diff -u src/tests/usr.bin/xlint/lint1/msg_132.exp:1.6 src/tests/usr.bin/xlint/lint1/msg_132.exp:1.7
--- src/tests/usr.bin/xlint/lint1/msg_132.exp:1.6 Tue Apr 19 22:40:13 2022
+++ src/tests/usr.bin/xlint/lint1/msg_132.exp Wed Apr 20 22:50:56 2022
@@ -12,4 +12,4 @@ msg_132.c(55): warning: conversion from
msg_132.c(59): warning: conversion from 'long long' to 'int' may lose accuracy [132]
msg_132.c(85): error: operands of '+' have incompatible types (pointer != double) [107]
msg_132.c(85): warning: function 'cover_build_plus_minus' expects to return value [214]
-msg_132.c(101): warning: conversion from 'unsigned long' to 'int' may lose accuracy [132]
+msg_132.c(101): warning: conversion from 'unsigned long long' to 'int' may lose accuracy [132]
