Skip to content

Commit b8ba266

Browse files
[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.
1 parent b92bab3 commit b8ba266

20 files changed

+60
-26
lines changed

libc/test/src/stdbit/stdc_bit_ceil_uc_test.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@ TEST(LlvmLibcStdcBitceilUcTest, Zero) {
1717

1818
TEST(LlvmLibcStdcBitceilUcTest, Ones) {
1919
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(1U << i),
21-
static_cast<unsigned char>(1U << i));
20+
EXPECT_EQ(
21+
LIBC_NAMESPACE::stdc_bit_ceil_uc(static_cast<unsigned char>(1U << i)),
22+
static_cast<unsigned char>(1U << i));
2223
}
2324

2425
TEST(LlvmLibcStdcBitceilUcTest, OneLessThanPowsTwo) {
2526
for (unsigned i = 2U; i != UCHAR_WIDTH; ++i)
26-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc((1U << i) - 1),
27+
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(
28+
static_cast<unsigned char>((1U << i) - 1)),
2729
static_cast<unsigned char>(1U << i));
2830
}
2931

3032
TEST(LlvmLibcStdcBitceilUcTest, OneMoreThanPowsTwo) {
3133
for (unsigned i = 1U; i != UCHAR_WIDTH - 1; ++i)
32-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc((1U << i) + 1),
34+
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_uc(
35+
static_cast<unsigned char>((1U << i) + 1)),
3336
static_cast<unsigned char>(1U << (i + 1)));
3437
}

libc/test/src/stdbit/stdc_bit_ceil_us_test.cpp

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,18 +17,21 @@ TEST(LlvmLibcStdcBitceilUsTest, Zero) {
1717

1818
TEST(LlvmLibcStdcBitceilUsTest, Ones) {
1919
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(1U << i),
21-
static_cast<unsigned short>(1U << i));
20+
EXPECT_EQ(
21+
LIBC_NAMESPACE::stdc_bit_ceil_us(static_cast<unsigned short>(1U << i)),
22+
static_cast<unsigned short>(1U << i));
2223
}
2324

2425
TEST(LlvmLibcStdcBitceilUsTest, OneLessThanPowsTwo) {
2526
for (unsigned i = 2U; i != USHRT_WIDTH; ++i)
26-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us((1U << i) - 1),
27+
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(
28+
static_cast<unsigned short>((1U << i) - 1)),
2729
static_cast<unsigned short>(1U << i));
2830
}
2931

3032
TEST(LlvmLibcStdcBitceilUsTest, OneMoreThanPowsTwo) {
3133
for (unsigned i = 1U; i != USHRT_WIDTH - 1; ++i)
32-
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us((1U << i) + 1),
34+
EXPECT_EQ(LIBC_NAMESPACE::stdc_bit_ceil_us(
35+
static_cast<unsigned short>((1U << i) + 1)),
3336
static_cast<unsigned short>(1U << (i + 1)));
3437
}

libc/test/src/stdbit/stdc_first_leading_one_uc_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingOneUcTest, Zero) {
1616

1717
TEST(LlvmLibcStdcFirstLeadingOneUcTest, OneHot) {
1818
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_uc(1U << i),
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_uc(
20+
static_cast<unsigned char>(1U << i)),
2021
UCHAR_WIDTH - i);
2122
}

libc/test/src/stdbit/stdc_first_leading_one_us_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingOneUsTest, Zero) {
1616

1717
TEST(LlvmLibcStdcFirstLeadingOneUsTest, OneHot) {
1818
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_us(1U << i),
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_one_us(
20+
static_cast<unsigned short>(1U << i)),
2021
USHRT_WIDTH - i);
2122
}

libc/test/src/stdbit/stdc_first_leading_zero_uc_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingZeroUcTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstLeadingZeroUcTest, ZeroHot) {
1818
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_uc(~(1U << i)),
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_uc(
20+
static_cast<unsigned char>(~(1U << i))),
2021
UCHAR_WIDTH - i);
2122
}

libc/test/src/stdbit/stdc_first_leading_zero_us_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ TEST(LlvmLibcStdcFirstLeadingZeroUsTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstLeadingZeroUsTest, ZeroHot) {
1818
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_us(~(1U << i)),
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_leading_zero_us(
20+
static_cast<unsigned short>(~(1U << i))),
2021
USHRT_WIDTH - i);
2122
}

libc/test/src/stdbit/stdc_first_trailing_one_uc_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingOneUcTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstTrailingOneUcTest, OneHot) {
1818
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_uc(1U << i), i + 1);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_uc(
20+
static_cast<unsigned char>(1U << i)),
21+
i + 1);
2022
}

libc/test/src/stdbit/stdc_first_trailing_one_us_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingOneUsTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstTrailingOneUsTest, OneHot) {
1818
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_us(1U << i), i + 1);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_one_us(
20+
static_cast<unsigned short>(1U << i)),
21+
i + 1);
2022
}

libc/test/src/stdbit/stdc_first_trailing_zero_uc_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingZeroUcTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstTrailingZeroUcTest, ZeroHot) {
1818
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_uc(~(1U << i)), i + 1);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_uc(
20+
static_cast<unsigned char>(~(1U << i))),
21+
i + 1);
2022
}

libc/test/src/stdbit/stdc_first_trailing_zero_us_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcFirstTrailingZeroUsTest, ALL) {
1616

1717
TEST(LlvmLibcStdcFirstTrailingZeroUsTest, ZeroHot) {
1818
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_us(~(1U << i)), i + 1);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_first_trailing_zero_us(
20+
static_cast<unsigned short>(~(1U << i))),
21+
i + 1);
2022
}

libc/test/src/stdbit/stdc_has_single_bit_uc_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcHasSingleBitUcTest, Zero) {
1616

1717
TEST(LlvmLibcStdcHasSingleBitUcTest, OneHot) {
1818
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_uc(1U << i), true);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_uc(
20+
static_cast<unsigned char>(1U << i)),
21+
true);
2022
}

libc/test/src/stdbit/stdc_has_single_bit_us_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ TEST(LlvmLibcStdcHasSingleBitUsTest, Zero) {
1616

1717
TEST(LlvmLibcStdcHasSingleBitUsTest, OneHot) {
1818
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
19-
EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_us(1U << i), true);
19+
EXPECT_EQ(LIBC_NAMESPACE::stdc_has_single_bit_us(
20+
static_cast<unsigned short>(1U << i)),
21+
true);
2022
}

libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingOnesUcTest, All) {
1717

1818
TEST(LlvmLibcStdcLeadingOnesUcTest, ZeroHot) {
1919
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_uc(~(1U << i)),
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_uc(
21+
static_cast<unsigned char>(~(1U << i))),
2122
UCHAR_WIDTH - i - 1U);
2223
}

libc/test/src/stdbit/stdc_leading_ones_us_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingOnesUsTest, All) {
1717

1818
TEST(LlvmLibcStdcLeadingOnesUsTest, ZeroHot) {
1919
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_us(~(1U << i)),
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_us(
21+
static_cast<unsigned short>(~(1U << i))),
2122
USHRT_WIDTH - i - 1U);
2223
}

libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingZerosUcTest, Zero) {
1717

1818
TEST(LlvmLibcStdcLeadingZerosUcTest, OneHot) {
1919
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_uc(1U << i),
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_uc(
21+
static_cast<unsigned char>(1U << i)),
2122
UCHAR_WIDTH - i - 1U);
2223
}

libc/test/src/stdbit/stdc_leading_zeros_us_test.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ TEST(LlvmLibcStdcLeadingZerosUsTest, Zero) {
1717

1818
TEST(LlvmLibcStdcLeadingZerosUsTest, OneHot) {
1919
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_us(1U << i),
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_us(
21+
static_cast<unsigned short>(1U << i)),
2122
USHRT_WIDTH - i - 1U);
2223
}

libc/test/src/stdbit/stdc_trailing_ones_uc_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingOnesUcTest, ALL) {
1717

1818
TEST(LlvmLibcStdcTrailingOnesUcTest, ZeroHot) {
1919
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_uc(~(1U << i)), i);
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_uc(
21+
static_cast<unsigned char>(~(1U << i))),
22+
i);
2123
}

libc/test/src/stdbit/stdc_trailing_ones_us_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingOnesUsTest, ALL) {
1717

1818
TEST(LlvmLibcStdcTrailingOnesUsTest, ZeroHot) {
1919
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_us(~(1U << i)), i);
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_ones_us(
21+
static_cast<unsigned short>(~(1U << i))),
22+
i);
2123
}

libc/test/src/stdbit/stdc_trailing_zeros_uc_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingZerosUcTest, Zero) {
1717

1818
TEST(LlvmLibcStdcTrailingZerosUcTest, OneHot) {
1919
for (unsigned i = 0U; i != UCHAR_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_uc(1U << i), i);
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_uc(
21+
static_cast<unsigned char>(1U << i)),
22+
i);
2123
}

libc/test/src/stdbit/stdc_trailing_zeros_us_test.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,7 @@ TEST(LlvmLibcStdcTrailingZerosUsTest, Zero) {
1717

1818
TEST(LlvmLibcStdcTrailingZerosUsTest, OneHot) {
1919
for (unsigned i = 0U; i != USHRT_WIDTH; ++i)
20-
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_us(1U << i), i);
20+
EXPECT_EQ(LIBC_NAMESPACE::stdc_trailing_zeros_us(
21+
static_cast<unsigned short>(1U << i)),
22+
i);
2123
}

0 commit comments

Comments
 (0)