Skip to content

Commit edbd93d

Browse files
nickdesaulniersnickdesaulniers
authored
[libc][stdbit] fix return types (#80337)
All of the functions I've previously implemented return an unsigned int; not the parameter type.
1 parent 59e5590 commit edbd93d

28 files changed

+77
-89
lines changed

‎libc/include/llvm-libc-macros/stdbit-macros.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,34 +10,34 @@
1010
#define __LLVM_LIBC_MACROS_STDBIT_MACROS_H
1111

1212
#ifdef __cplusplus
13-
inline unsigned char stdc_leading_zeros(unsigned char x) {
13+
inline unsigned stdc_leading_zeros(unsigned char x) {
1414
return stdc_leading_zeros_uc(x);
1515
}
16-
inline unsigned short stdc_leading_zeros(unsigned short x) {
16+
inline unsigned stdc_leading_zeros(unsigned short x) {
1717
return stdc_leading_zeros_us(x);
1818
}
1919
inline unsigned stdc_leading_zeros(unsigned x) {
2020
return stdc_leading_zeros_ui(x);
2121
}
22-
inline unsigned long stdc_leading_zeros(unsigned long x) {
22+
inline unsigned stdc_leading_zeros(unsigned long x) {
2323
return stdc_leading_zeros_ul(x);
2424
}
25-
inline unsigned long long stdc_leading_zeros(unsigned long long x) {
25+
inline unsigned stdc_leading_zeros(unsigned long long x) {
2626
return stdc_leading_zeros_ull(x);
2727
}
28-
inline unsigned char stdc_leading_ones(unsigned char x) {
28+
inline unsigned stdc_leading_ones(unsigned char x) {
2929
return stdc_leading_ones_uc(x);
3030
}
31-
inline unsigned short stdc_leading_ones(unsigned short x) {
31+
inline unsigned stdc_leading_ones(unsigned short x) {
3232
return stdc_leading_ones_us(x);
3333
}
3434
inline unsigned stdc_leading_ones(unsigned x) {
3535
return stdc_leading_ones_ui(x);
3636
}
37-
inline unsigned long stdc_leading_ones(unsigned long x) {
37+
inline unsigned stdc_leading_ones(unsigned long x) {
3838
return stdc_leading_ones_ul(x);
3939
}
40-
inline unsigned long long stdc_leading_ones(unsigned long long x) {
40+
inline unsigned stdc_leading_ones(unsigned long long x) {
4141
return stdc_leading_ones_ull(x);
4242
}
4343
#else

‎libc/spec/stdc.td

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -775,16 +775,16 @@ def StdC : StandardSpec<"stdc"> {
775775
[], // Types
776776
[], // Enumerations
777777
[
778-
FunctionSpec<"stdc_leading_zeros_uc", RetValSpec<UnsignedCharType>, [ArgSpec<UnsignedCharType>]>,
779-
FunctionSpec<"stdc_leading_zeros_us", RetValSpec<UnsignedShortType>, [ArgSpec<UnsignedShortType>]>,
778+
FunctionSpec<"stdc_leading_zeros_uc", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedCharType>]>,
779+
FunctionSpec<"stdc_leading_zeros_us", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedShortType>]>,
780780
FunctionSpec<"stdc_leading_zeros_ui", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedIntType>]>,
781-
FunctionSpec<"stdc_leading_zeros_ul", RetValSpec<UnsignedLongType>, [ArgSpec<UnsignedLongType>]>,
782-
FunctionSpec<"stdc_leading_zeros_ull", RetValSpec<UnsignedLongLongType>, [ArgSpec<UnsignedLongLongType>]>,
783-
FunctionSpec<"stdc_leading_ones_uc", RetValSpec<UnsignedCharType>, [ArgSpec<UnsignedCharType>]>,
784-
FunctionSpec<"stdc_leading_ones_us", RetValSpec<UnsignedShortType>, [ArgSpec<UnsignedShortType>]>,
781+
FunctionSpec<"stdc_leading_zeros_ul", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedLongType>]>,
782+
FunctionSpec<"stdc_leading_zeros_ull", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedLongLongType>]>,
783+
FunctionSpec<"stdc_leading_ones_uc", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedCharType>]>,
784+
FunctionSpec<"stdc_leading_ones_us", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedShortType>]>,
785785
FunctionSpec<"stdc_leading_ones_ui", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedIntType>]>,
786-
FunctionSpec<"stdc_leading_ones_ul", RetValSpec<UnsignedLongType>, [ArgSpec<UnsignedLongType>]>,
787-
FunctionSpec<"stdc_leading_ones_ull", RetValSpec<UnsignedLongLongType>, [ArgSpec<UnsignedLongLongType>]>
786+
FunctionSpec<"stdc_leading_ones_ul", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedLongType>]>,
787+
FunctionSpec<"stdc_leading_ones_ull", RetValSpec<UnsignedIntType>, [ArgSpec<UnsignedLongLongType>]>
788788
] // Functions
789789
>;
790790

‎libc/src/stdbit/stdc_leading_ones_uc.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned char, stdc_leading_ones_uc, (unsigned char value)) {
17-
return static_cast<unsigned char>(cpp::countl_one(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_uc, (unsigned char value)) {
17+
return static_cast<unsigned>(cpp::countl_one(value));
1818
}
1919

2020
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_ones_uc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned char stdc_leading_ones_uc(unsigned char value);
14+
unsigned stdc_leading_ones_uc(unsigned char value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_ones_ul.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned long, stdc_leading_ones_ul, (unsigned long value)) {
17-
return static_cast<unsigned long>(cpp::countl_one(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_ul, (unsigned long value)) {
17+
return static_cast<unsigned>(cpp::countl_one(value));
1818
}
1919

2020
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_ones_ul.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned long stdc_leading_ones_ul(unsigned long value);
14+
unsigned stdc_leading_ones_ul(unsigned long value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_ones_ull.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned long long, stdc_leading_ones_ull,
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_ull,
1717
(unsigned long long value)) {
18-
return static_cast<unsigned long long>(cpp::countl_one(value));
18+
return static_cast<unsigned>(cpp::countl_one(value));
1919
}
2020

2121
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_ones_ull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned long long stdc_leading_ones_ull(unsigned long long value);
14+
unsigned stdc_leading_ones_ull(unsigned long long value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_ones_us.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned short, stdc_leading_ones_us,
17-
(unsigned short value)) {
18-
return static_cast<unsigned short>(cpp::countl_one(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_ones_us, (unsigned short value)) {
17+
return static_cast<unsigned>(cpp::countl_one(value));
1918
}
2019

2120
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_ones_us.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned short stdc_leading_ones_us(unsigned short value);
14+
unsigned stdc_leading_ones_us(unsigned short value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_zeros_uc.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned char, stdc_leading_zeros_uc,
17-
(unsigned char value)) {
18-
return static_cast<unsigned char>(cpp::countl_zero(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_uc, (unsigned char value)) {
17+
return static_cast<unsigned>(cpp::countl_zero(value));
1918
}
2019

2120
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_zeros_uc.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned char stdc_leading_zeros_uc(unsigned char value);
14+
unsigned stdc_leading_zeros_uc(unsigned char value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_zeros_ul.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned long, stdc_leading_zeros_ul,
17-
(unsigned long value)) {
18-
return static_cast<unsigned long>(cpp::countl_zero(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ul, (unsigned long value)) {
17+
return static_cast<unsigned>(cpp::countl_zero(value));
1918
}
2019

2120
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_zeros_ul.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned long stdc_leading_zeros_ul(unsigned long value);
14+
unsigned stdc_leading_zeros_ul(unsigned long value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_zeros_ull.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned long long, stdc_leading_zeros_ull,
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_ull,
1717
(unsigned long long value)) {
18-
return static_cast<unsigned long long>(cpp::countl_zero(value));
18+
return static_cast<unsigned>(cpp::countl_zero(value));
1919
}
2020

2121
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_zeros_ull.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned long long stdc_leading_zeros_ull(unsigned long long value);
14+
unsigned stdc_leading_zeros_ull(unsigned long long value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/src/stdbit/stdc_leading_zeros_us.cpp

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,8 @@
1313

1414
namespace LIBC_NAMESPACE {
1515

16-
LLVM_LIBC_FUNCTION(unsigned short, stdc_leading_zeros_us,
17-
(unsigned short value)) {
18-
return static_cast<unsigned short>(cpp::countl_zero(value));
16+
LLVM_LIBC_FUNCTION(unsigned, stdc_leading_zeros_us, (unsigned short value)) {
17+
return static_cast<unsigned>(cpp::countl_zero(value));
1918
}
2019

2120
} // namespace LIBC_NAMESPACE

‎libc/src/stdbit/stdc_leading_zeros_us.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
namespace LIBC_NAMESPACE {
1313

14-
unsigned short stdc_leading_zeros_us(unsigned short value);
14+
unsigned stdc_leading_zeros_us(unsigned short value);
1515

1616
} // namespace LIBC_NAMESPACE
1717

‎libc/test/include/stdbit_test.cpp

Lines changed: 20 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -23,40 +23,32 @@
2323
* enabled.
2424
*/
2525
extern "C" {
26-
unsigned char stdc_leading_zeros_uc(unsigned char) noexcept { return 0xAA; }
27-
unsigned short stdc_leading_zeros_us(unsigned short) noexcept { return 0xAB; }
28-
unsigned stdc_leading_zeros_ui(unsigned) noexcept { return 0xAC; }
29-
unsigned long stdc_leading_zeros_ul(unsigned long) noexcept { return 0xAD; }
30-
unsigned long long stdc_leading_zeros_ull(unsigned long long) noexcept {
31-
return 0xAF;
32-
}
33-
unsigned char stdc_leading_ones_uc(unsigned char) noexcept { return 0xBA; }
34-
unsigned short stdc_leading_ones_us(unsigned short) noexcept { return 0xBB; }
35-
unsigned stdc_leading_ones_ui(unsigned) noexcept { return 0xBC; }
36-
unsigned long stdc_leading_ones_ul(unsigned long) noexcept { return 0xBD; }
37-
unsigned long long stdc_leading_ones_ull(unsigned long long) noexcept {
38-
return 0xBF;
39-
}
26+
unsigned stdc_leading_zeros_uc(unsigned char) noexcept { return 0xAAU; }
27+
unsigned stdc_leading_zeros_us(unsigned short) noexcept { return 0xABU; }
28+
unsigned stdc_leading_zeros_ui(unsigned) noexcept { return 0xACU; }
29+
unsigned stdc_leading_zeros_ul(unsigned long) noexcept { return 0xADU; }
30+
unsigned stdc_leading_zeros_ull(unsigned long long) noexcept { return 0xAFU; }
31+
unsigned stdc_leading_ones_uc(unsigned char) noexcept { return 0xBAU; }
32+
unsigned stdc_leading_ones_us(unsigned short) noexcept { return 0xBBU; }
33+
unsigned stdc_leading_ones_ui(unsigned) noexcept { return 0xBCU; }
34+
unsigned stdc_leading_ones_ul(unsigned long) noexcept { return 0xBDU; }
35+
unsigned stdc_leading_ones_ull(unsigned long long) noexcept { return 0xBFU; }
4036
}
4137

4238
#include "include/llvm-libc-macros/stdbit-macros.h"
4339

4440
TEST(LlvmLibcStdbitTest, TypeGenericMacroLeadingZeros) {
45-
EXPECT_EQ(stdc_leading_zeros(static_cast<unsigned char>(0U)),
46-
static_cast<unsigned char>(0xAA));
47-
EXPECT_EQ(stdc_leading_zeros(static_cast<unsigned short>(0U)),
48-
static_cast<unsigned short>(0xAB));
49-
EXPECT_EQ(stdc_leading_zeros(0U), static_cast<unsigned>(0xAC));
50-
EXPECT_EQ(stdc_leading_zeros(0UL), static_cast<unsigned long>(0xAD));
51-
EXPECT_EQ(stdc_leading_zeros(0ULL), static_cast<unsigned long long>(0xAF));
41+
EXPECT_EQ(stdc_leading_zeros(static_cast<unsigned char>(0U)), 0xAAU);
42+
EXPECT_EQ(stdc_leading_zeros(static_cast<unsigned short>(0U)), 0xABU);
43+
EXPECT_EQ(stdc_leading_zeros(0U), 0xACU);
44+
EXPECT_EQ(stdc_leading_zeros(0UL), 0xADU);
45+
EXPECT_EQ(stdc_leading_zeros(0ULL), 0xAFU);
5246
}
5347

5448
TEST(LlvmLibcStdbitTest, TypeGenericMacroLeadingOnes) {
55-
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned char>(0U)),
56-
static_cast<unsigned char>(0xBA));
57-
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned short>(0U)),
58-
static_cast<unsigned short>(0xBB));
59-
EXPECT_EQ(stdc_leading_ones(0U), static_cast<unsigned>(0xBC));
60-
EXPECT_EQ(stdc_leading_ones(0UL), static_cast<unsigned long>(0xBD));
61-
EXPECT_EQ(stdc_leading_ones(0ULL), static_cast<unsigned long long>(0xBF));
49+
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned char>(0U)), 0xBAU);
50+
EXPECT_EQ(stdc_leading_ones(static_cast<unsigned short>(0U)), 0xBBU);
51+
EXPECT_EQ(stdc_leading_ones(0U), 0xBCU);
52+
EXPECT_EQ(stdc_leading_ones(0UL), 0xBDU);
53+
EXPECT_EQ(stdc_leading_ones(0ULL), 0xBFU);
6254
}

‎libc/test/src/stdbit/stdc_leading_ones_uc_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
TEST(LlvmLibcStdcLeadingOnesUcTest, All) {
1414
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_uc(UCHAR_MAX),
15-
static_cast<unsigned char>(UCHAR_WIDTH));
15+
static_cast<unsigned>(UCHAR_WIDTH));
1616
}
1717

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

‎libc/test/src/stdbit/stdc_leading_ones_ui_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@ TEST(LlvmLibcStdcLeadingOnesUiTest, All) {
1818
TEST(LlvmLibcStdcLeadingOnesUiTest, ZeroHot) {
1919
for (unsigned i = 0U; i != UINT_WIDTH; ++i)
2020
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_ui(~(1U << i)),
21-
static_cast<unsigned>(UINT_WIDTH - i - 1));
21+
UINT_WIDTH - i - 1U);
2222
}

‎libc/test/src/stdbit/stdc_leading_ones_ul_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
TEST(LlvmLibcStdcLeadingOnesUlTest, All) {
1414
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_ul(ULONG_MAX),
15-
static_cast<unsigned long>(ULONG_WIDTH));
15+
static_cast<unsigned>(ULONG_WIDTH));
1616
}
1717

1818
TEST(LlvmLibcStdcLeadingOnesUlTest, ZeroHot) {
1919
for (unsigned i = 0U; i != ULONG_WIDTH; ++i)
2020
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_ul(~(1UL << i)),
21-
static_cast<unsigned long>(ULONG_WIDTH - i - 1));
21+
ULONG_WIDTH - i - 1U);
2222
}

‎libc/test/src/stdbit/stdc_leading_ones_ull_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
TEST(LlvmLibcStdcLeadingOnesUllTest, All) {
1414
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_ull(ULLONG_MAX),
15-
static_cast<unsigned long long>(ULLONG_WIDTH));
15+
static_cast<unsigned>(ULLONG_WIDTH));
1616
}
1717

1818
TEST(LlvmLibcStdcLeadingOnesUllTest, ZeroHot) {
1919
for (unsigned i = 0U; i != ULLONG_WIDTH; ++i)
2020
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_ull(~(1ULL << i)),
21-
static_cast<unsigned long long>(ULLONG_WIDTH - i - 1));
21+
ULLONG_WIDTH - i - 1U);
2222
}

‎libc/test/src/stdbit/stdc_leading_ones_us_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
TEST(LlvmLibcStdcLeadingOnesUsTest, All) {
1414
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_ones_us(USHRT_MAX),
15-
static_cast<unsigned short>(USHRT_WIDTH));
15+
static_cast<unsigned>(USHRT_WIDTH));
1616
}
1717

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

‎libc/test/src/stdbit/stdc_leading_zeros_uc_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@
1212

1313
TEST(LlvmLibcStdcLeadingZerosUcTest, Zero) {
1414
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_uc(0U),
15-
static_cast<unsigned char>(UCHAR_WIDTH));
15+
static_cast<unsigned>(UCHAR_WIDTH));
1616
}
1717

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

‎libc/test/src/stdbit/stdc_leading_zeros_ul_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
TEST(LlvmLibcStdcLeadingZerosUlTest, Zero) {
1515
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ul(0UL),
16-
static_cast<unsigned long>(ULONG_WIDTH));
16+
static_cast<unsigned>(ULONG_WIDTH));
1717
}
1818

1919
TEST(LlvmLibcStdcLeadingZerosUlTest, OneHot) {
2020
for (unsigned i = 0U; i != ULONG_WIDTH; ++i)
2121
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ul(1UL << i),
22-
static_cast<unsigned long>(ULONG_WIDTH - i - 1));
22+
ULONG_WIDTH - i - 1U);
2323
}

‎libc/test/src/stdbit/stdc_leading_zeros_ull_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@
1313

1414
TEST(LlvmLibcStdcLeadingZerosUllTest, Zero) {
1515
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ull(0ULL),
16-
static_cast<unsigned long long>(ULLONG_WIDTH));
16+
static_cast<unsigned>(ULLONG_WIDTH));
1717
}
1818

1919
TEST(LlvmLibcStdcLeadingZerosUllTest, OneHot) {
2020
for (unsigned i = 0U; i != ULLONG_WIDTH; ++i)
2121
EXPECT_EQ(LIBC_NAMESPACE::stdc_leading_zeros_ull(1ULL << i),
22-
static_cast<unsigned long long>(ULLONG_WIDTH - i - 1));
22+
ULLONG_WIDTH - i - 1U);
2323
}

0 commit comments

Comments
 (0)