[libc-commits] [libc] b8ba266 - [libc][test][stdbit] fix -Wimplicit-int-conversion (#126616)
via libc-commits
libc-commits at lists.llvm.org
Tue Feb 11 09:31:05 PST 2025
Author: Nick Desaulniers
Date: 2025-02-11T09:31:01-08:00
New Revision: b8ba266820ca51216c98216369a4947a942ec21c
URL: https://github.com/llvm/llvm-project/commit/b8ba266820ca51216c98216369a4947a942ec21c
DIFF: https://github.com/llvm/llvm-project/commit/b8ba266820ca51216c98216369a4947a942ec21c.diff
LOG: [libc][test][stdbit] fix -Wimplicit-int-conversion (#126616)
When cross compiling the libc-stdbit-tests, the existing tests trigger numerous
instances of -Wimplicit-int-conversion. The truncation of these implicit
promotions is intentional.
Added:
Modified:
libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp
libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp
libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp
libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp
libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp
libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp
libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp
libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp
libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp
libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp
libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp
libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp
libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp
libc/test/src/stdbit/stdc_leading_ones_us_test.cpp
libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp
libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp
libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp
libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp
libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp
libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp
Removed:
################################################################################
diff --git a/libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp b/libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp
index 1ef87b0d44de6..6915859b7c669 100644
--- a/libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp
@@ -17,18 +17,21 @@ TEST(LlvmLibcStdcBitceilUcTest, Zero) {
TEST(LlvmLibcStdcBitceilUcTest, Ones) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(1U << i),
- static_cast<unsigned char>(1U << i));
+ EXPECT_EQ(
+ LIBC_NAMESPACE::stdc_bit_ceil_uc(static_cast<unsigned char>(1U << i)),
+ static_cast<unsigned char>(1U << i));
}
TEST(LlvmLibcStdcBitceilUcTest, OneLessThanPowsTwo) {
for (unsigned i = 2U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc((1U << i) - 1),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(
+ static_cast<unsigned char>((1U << i) - 1)),
static_cast<unsigned char>(1U << i));
}
TEST(LlvmLibcStdcBitceilUcTest, OneMoreThanPowsTwo) {
for (unsigned i = 1U; i != UCHAR_WIDTH - 1; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc((1U << i) + 1),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(
+ static_cast<unsigned char>((1U << i) + 1)),
static_cast<unsigned char>(1U << (i + 1)));
}
diff --git a/libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp b/libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp
index 56873c51828f1..9a8b46f250f48 100644
--- a/libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp
@@ -17,18 +17,21 @@ TEST(LlvmLibcStdcBitceilUsTest, Zero) {
TEST(LlvmLibcStdcBitceilUsTest, Ones) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(1U << i),
- static_cast<unsigned short>(1U << i));
+ EXPECT_EQ(
+ LIBC_NAMESPACE::stdc_bit_ceil_us(static_cast<unsigned short>(1U << i)),
+ static_cast<unsigned short>(1U << i));
}
TEST(LlvmLibcStdcBitceilUsTest, OneLessThanPowsTwo) {
for (unsigned i = 2U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us((1U << i) - 1),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(
+ static_cast<unsigned short>((1U << i) - 1)),
static_cast<unsigned short>(1U << i));
}
TEST(LlvmLibcStdcBitceilUsTest, OneMoreThanPowsTwo) {
for (unsigned i = 1U; i != USHRT_WIDTH - 1; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us((1U << i) + 1),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(
+ static_cast<unsigned short>((1U << i) + 1)),
static_cast<unsigned short>(1U << (i + 1)));
}
diff --git a/libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp b/libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp
index b8c8db587098e..2ab8397015288 100644
--- a/libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingOneUcTest, Zero) {
TEST(LlvmLibcStdcFirstLeadingOneUcTest, OneHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_uc(1U << i),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_uc(
+ static_cast<unsigned char>(1U << i)),
UCHAR_WIDTH - i);
}
diff --git a/libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp b/libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp
index e9488335d9b00..de81275205424 100644
--- a/libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingOneUsTest, Zero) {
TEST(LlvmLibcStdcFirstLeadingOneUsTest, OneHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_us(1U << i),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_us(
+ static_cast<unsigned short>(1U << i)),
USHRT_WIDTH - i);
}
diff --git a/libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp b/libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp
index ac7e8c7d9e64b..a19d0ab83a9bd 100644
--- a/libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingZeroUcTest, ALL) {
TEST(LlvmLibcStdcFirstLeadingZeroUcTest, ZeroHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_uc(~(1U << i)),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_uc(
+ static_cast<unsigned char>(~(1U << i))),
UCHAR_WIDTH - i);
}
diff --git a/libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp b/libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp
index 37f8612675a7a..2971267f82a6f 100644
--- a/libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingZeroUsTest, ALL) {
TEST(LlvmLibcStdcFirstLeadingZeroUsTest, ZeroHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_us(~(1U << i)),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_us(
+ static_cast<unsigned short>(~(1U << i))),
USHRT_WIDTH - i);
}
diff --git a/libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp b/libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp
index ed2b4921cdada..5ca4cfca1b479 100644
--- a/libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingOneUcTest, ALL) {
TEST(LlvmLibcStdcFirstTrailingOneUcTest, OneHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_uc(1U << i), i + 1);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_uc(
+ static_cast<unsigned char>(1U << i)),
+ i + 1);
}
diff --git a/libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp b/libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp
index 60021552310be..46c69acfb7f07 100644
--- a/libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingOneUsTest, ALL) {
TEST(LlvmLibcStdcFirstTrailingOneUsTest, OneHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_us(1U << i), i + 1);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_us(
+ static_cast<unsigned short>(1U << i)),
+ i + 1);
}
diff --git a/libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp b/libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp
index 2b17aa6536e66..9535ad9ffa3a2 100644
--- a/libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingZeroUcTest, ALL) {
TEST(LlvmLibcStdcFirstTrailingZeroUcTest, ZeroHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_uc(~(1U << i)), i + 1);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_uc(
+ static_cast<unsigned char>(~(1U << i))),
+ i + 1);
}
diff --git a/libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp b/libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp
index e370379300e4a..e0dc34fd89996 100644
--- a/libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingZeroUsTest, ALL) {
TEST(LlvmLibcStdcFirstTrailingZeroUsTest, ZeroHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_us(~(1U << i)), i + 1);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_us(
+ static_cast<unsigned short>(~(1U << i))),
+ i + 1);
}
diff --git a/libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp b/libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp
index 1bc189cf0b665..9dd2bdc12479d 100644
--- a/libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcHasSingleBitUcTest, Zero) {
TEST(LlvmLibcStdcHasSingleBitUcTest, OneHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_uc(1U << i), true);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_uc(
+ static_cast<unsigned char>(1U << i)),
+ true);
}
diff --git a/libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp b/libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp
index a038f6fac0123..3ff0b83751ebf 100644
--- a/libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcHasSingleBitUsTest, Zero) {
TEST(LlvmLibcStdcHasSingleBitUsTest, OneHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_us(1U << i), true);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_us(
+ static_cast<unsigned short>(1U << i)),
+ true);
}
diff --git a/libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp b/libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp
index 5d32d92e327a3..4ba240fdafad4 100644
--- a/libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingOnesUcTest, All) {
TEST(LlvmLibcStdcLeadingOnesUcTest, ZeroHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_uc(~(1U << i)),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_uc(
+ static_cast<unsigned char>(~(1U << i))),
UCHAR_WIDTH - i - 1U);
}
diff --git a/libc/test/src/stdbit/stdc_leading_ones_us_test.cpp b/libc/test/src/stdbit/stdc_leading_ones_us_test.cpp
index 91a125370ec15..0f93eed9e10b8 100644
--- a/libc/test/src/stdbit/stdc_leading_ones_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_leading_ones_us_test.cpp
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingOnesUsTest, All) {
TEST(LlvmLibcStdcLeadingOnesUsTest, ZeroHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_us(~(1U << i)),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_us(
+ static_cast<unsigned short>(~(1U << i))),
USHRT_WIDTH - i - 1U);
}
diff --git a/libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp b/libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp
index 3d555072927ac..42f78c296fe09 100644
--- a/libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingZerosUcTest, Zero) {
TEST(LlvmLibcStdcLeadingZerosUcTest, OneHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_uc(1U << i),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_uc(
+ static_cast<unsigned char>(1U << i)),
UCHAR_WIDTH - i - 1U);
}
diff --git a/libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp b/libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp
index afb418a24ad54..967ceb13ff1d7 100644
--- a/libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingZerosUsTest, Zero) {
TEST(LlvmLibcStdcLeadingZerosUsTest, OneHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_us(1U << i),
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_us(
+ static_cast<unsigned short>(1U << i)),
USHRT_WIDTH - i - 1U);
}
diff --git a/libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp b/libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp
index 79d4e5b8b8032..0036408513388 100644
--- a/libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingOnesUcTest, ALL) {
TEST(LlvmLibcStdcTrailingOnesUcTest, ZeroHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_uc(~(1U << i)), i);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_uc(
+ static_cast<unsigned char>(~(1U << i))),
+ i);
}
diff --git a/libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp b/libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp
index 7ab15743ed1e0..5ebacc829c543 100644
--- a/libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingOnesUsTest, ALL) {
TEST(LlvmLibcStdcTrailingOnesUsTest, ZeroHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_us(~(1U << i)), i);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_us(
+ static_cast<unsigned short>(~(1U << i))),
+ i);
}
diff --git a/libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp b/libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp
index c02b518865d9f..129ab38c45ea8 100644
--- a/libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp
+++ b/libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingZerosUcTest, Zero) {
TEST(LlvmLibcStdcTrailingZerosUcTest, OneHot) {
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_uc(1U << i), i);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_uc(
+ static_cast<unsigned char>(1U << i)),
+ i);
}
diff --git a/libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp b/libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp
index a9f8327dfd914..e1171f24ccfda 100644
--- a/libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp
+++ b/libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingZerosUsTest, Zero) {
TEST(LlvmLibcStdcTrailingZerosUsTest, OneHot) {
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
- EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_us(1U << i), i);
+ EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_us(
+ static_cast<unsigned short>(1U << i)),
+ i);
}
More information about the libc-commits
mailing list