Skip to content

Commit d0a0de5

Browse files
lntuelntue
authored
[libc] Fix implicit conversion warnings in tests. (#131362)
1 parent 51c706c commit d0a0de5

34 files changed

+195
-195
lines changed

‎libc/src/__support/big_int.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -866,7 +866,7 @@ struct BigInt {
866866
LIBC_INLINE constexpr BigInt operator~() const {
867867
BigInt result;
868868
for (size_t i = 0; i < WORD_COUNT; ++i)
869-
result[i] = ~val[i];
869+
result[i] = static_cast<WordType>(~val[i]);
870870
return result;
871871
}
872872

@@ -967,7 +967,7 @@ struct BigInt {
967967

968968
LIBC_INLINE constexpr void bitwise_not() {
969969
for (auto &part : val)
970-
part = ~part;
970+
part = static_cast<WordType>(~part);
971971
}
972972

973973
LIBC_INLINE constexpr void negate() {

‎libc/test/integration/src/pthread/pthread_rwlock_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -324,8 +324,8 @@ struct ThreadGuard {
324324
~ThreadGuard() {
325325
if (!LIBC_NAMESPACE::getenv("LIBC_PTHREAD_RWLOCK_TEST_VERBOSE"))
326326
return;
327-
pid_t pid = LIBC_NAMESPACE::syscall_impl(SYS_getpid);
328-
pid_t tid = LIBC_NAMESPACE::syscall_impl(SYS_gettid);
327+
pid_t pid = static_cast<pid_t>(LIBC_NAMESPACE::syscall_impl(SYS_getpid));
328+
pid_t tid = static_cast<pid_t>(LIBC_NAMESPACE::syscall_impl(SYS_gettid));
329329
io_mutex->lock(LIBC_NAMESPACE::cpp::nullopt, true);
330330
LIBC_NAMESPACE::printf("process %d thread %d: ", pid, tid);
331331
for (size_t i = 0; i < cursor; ++i)

‎libc/test/integration/startup/gpu/rpc_stream_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ static void test_divergent() {
8181
LIBC_NAMESPACE::rpc::Client::Port port =
8282
LIBC_NAMESPACE::rpc::client.open<RPC_TEST_STREAM>();
8383
port.send_n(buffer, offset);
84-
inline_memset(buffer, offset, 0);
84+
inline_memset(buffer, 0, offset);
8585
port.recv_n(&recv_ptr, &recv_size, [&](uint64_t) { return buffer; });
8686
port.close();
8787

‎libc/test/integration/startup/gpu/rpc_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
using namespace LIBC_NAMESPACE;
1515

1616
static void test_add_simple() {
17-
uint32_t num_additions =
17+
uint64_t num_additions =
1818
10 + 10 * gpu::get_thread_id() + 10 * gpu::get_block_id();
1919
uint64_t cnt = 0;
2020
for (uint32_t i = 0; i < num_additions; ++i) {

‎libc/test/src/__support/HashTable/table_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ TEST(LlvmLibcTableTest, Iteration) {
4343
counter[i] = 0;
4444
if (i >= 256) {
4545
keys[i].bytes[0] = 2;
46-
keys[i].bytes[1] = i % 256;
46+
keys[i].bytes[1] = static_cast<uint8_t>(i % 256);
4747
keys[i].bytes[2] = 0;
4848
} else {
4949
keys[i].bytes[0] = 1;
50-
keys[i].bytes[1] = i;
50+
keys[i].bytes[1] = static_cast<uint8_t>(i);
5151
keys[i].bytes[2] = 0;
5252
}
5353
HashTable::insert(table, {reinterpret_cast<char *>(keys[i].bytes),

‎libc/test/src/__support/arg_list_test.cpp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,7 @@ long int check_struct_type(int first, ...) {
112112

113113
S s = args.next_var<S>();
114114
int last = args.next_var<int>();
115-
return static_cast<long int>(s.c + s.s + s.i + static_cast<long>(s.l) + s.f +
116-
s.d + last);
115+
return s.c + s.s + s.i + s.l + static_cast<long>(s.f + s.d) + last;
117116
}
118117

119118
TEST(LlvmLibcArgListTest, TestStructTypes) {

‎libc/test/src/__support/fixed_point/fx_bits_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ class LlvmLibcFxBitsTest : public LIBC_NAMESPACE::testing::Test {
2727
EXPECT_EQ(LIBC_NAMESPACE::fixed_point::bit_or(T(0.75), T(0.375)), T(0.875));
2828
using StorageType = typename FXRep<T>::StorageType;
2929
StorageType a = LIBC_NAMESPACE::cpp::bit_cast<StorageType>(T(0.75));
30-
a = ~a;
30+
a = static_cast<StorageType>(~a);
3131
EXPECT_EQ(LIBC_NAMESPACE::fixed_point::bit_not(T(0.75)),
3232
FXBits<T>(a).get_val());
3333
}

‎libc/test/src/complex/CImagTest.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,14 +38,14 @@ class CImagTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
3838
neg_min_denormal);
3939
EXPECT_FP_EQ(func(CFPT(1241.112 + max_denormal * 1.0i)), max_denormal);
4040
EXPECT_FP_EQ(func(CFPT(121.121 + zero * 1.0i)), zero);
41-
EXPECT_FP_EQ(func(CFPT(0.0 + 0.0i)), 0.0);
42-
EXPECT_FP_EQ(func(CFPT(-0.0 + 0.0i)), 0.0);
43-
EXPECT_FP_EQ(func(CFPT(0.0 - 0.0i)), -0.0);
44-
EXPECT_FP_EQ(func(CFPT(-0.0 - 0.0i)), -0.0);
45-
EXPECT_FP_EQ(func(CFPT(0.0)), 0.0);
46-
EXPECT_FP_EQ(func(CFPT(-0.0)), 0.0);
47-
EXPECT_FP_EQ(func(CFPT(0.0i)), 0.0);
48-
EXPECT_FP_EQ(func(CFPT(-0.0i)), -0.0);
41+
EXPECT_FP_EQ(func(CFPT(0.0 + 0.0i)), zero);
42+
EXPECT_FP_EQ(func(CFPT(-0.0 + 0.0i)), zero);
43+
EXPECT_FP_EQ(func(CFPT(0.0 - 0.0i)), neg_zero);
44+
EXPECT_FP_EQ(func(CFPT(-0.0 - 0.0i)), neg_zero);
45+
EXPECT_FP_EQ(func(CFPT(0.0)), zero);
46+
EXPECT_FP_EQ(func(CFPT(-0.0)), zero);
47+
EXPECT_FP_EQ(func(CFPT(0.0i)), zero);
48+
EXPECT_FP_EQ(func(CFPT(-0.0i)), neg_zero);
4949
}
5050

5151
void testRoundedNumbers(CImagFunc func) {

‎libc/test/src/complex/CRealTest.h

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -37,14 +37,14 @@ class CRealTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
3737
EXPECT_FP_EQ(func(CFPT(neg_min_denormal + 781.134i)), neg_min_denormal);
3838
EXPECT_FP_EQ(func(CFPT(max_denormal + 1241.112i)), max_denormal);
3939
EXPECT_FP_EQ(func(CFPT(zero + 121.121i)), zero);
40-
EXPECT_FP_EQ(func(CFPT(0.0 + 0.0i)), 0.0);
41-
EXPECT_FP_EQ(func(CFPT(-0.0 + 0.0i)), 0.0);
42-
EXPECT_FP_EQ(func(CFPT(0.0 - 0.0i)), 0.0);
43-
EXPECT_FP_EQ(func(CFPT(-0.0 - 0.0i)), -0.0);
44-
EXPECT_FP_EQ(func(CFPT(0.0)), 0.0);
45-
EXPECT_FP_EQ(func(CFPT(-0.0)), -0.0);
46-
EXPECT_FP_EQ(func(CFPT(0.0i)), 0.0);
47-
EXPECT_FP_EQ(func(CFPT(-0.0i)), -0.0);
40+
EXPECT_FP_EQ(func(CFPT(0.0 + 0.0i)), zero);
41+
EXPECT_FP_EQ(func(CFPT(-0.0 + 0.0i)), zero);
42+
EXPECT_FP_EQ(func(CFPT(0.0 - 0.0i)), zero);
43+
EXPECT_FP_EQ(func(CFPT(-0.0 - 0.0i)), neg_zero);
44+
EXPECT_FP_EQ(func(CFPT(0.0)), zero);
45+
EXPECT_FP_EQ(func(CFPT(-0.0)), neg_zero);
46+
EXPECT_FP_EQ(func(CFPT(0.0i)), zero);
47+
EXPECT_FP_EQ(func(CFPT(-0.0i)), neg_zero);
4848
}
4949

5050
void testRoundedNumbers(CRealFunc func) {

‎libc/test/src/fcntl/openat_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ TEST(LlvmLibcUniStd, OpenAndReadTest) {
2424
ASSERT_ERRNO_SUCCESS();
2525
ASSERT_GT(dir_fd, 0);
2626
constexpr const char TEST_MSG[] = "openat test";
27-
constexpr int TEST_MSG_SIZE = sizeof(TEST_MSG) - 1;
27+
constexpr ssize_t TEST_MSG_SIZE = sizeof(TEST_MSG) - 1;
2828

2929
int read_fd = LIBC_NAMESPACE::openat(dir_fd, TEST_FILE, O_RDONLY);
3030
ASSERT_ERRNO_SUCCESS();

‎libc/test/src/math/CopySignTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@ class CopySignTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
4242
if (FPBits(v).is_nan() || FPBits(v).is_inf())
4343
continue;
4444

45-
double res1 = func(x, -x);
45+
T res1 = func(x, -x);
4646
ASSERT_FP_EQ(res1, -x);
4747

48-
double res2 = func(x, x);
48+
T res2 = func(x, x);
4949
ASSERT_FP_EQ(res2, x);
5050
}
5151
}

‎libc/test/src/math/FMaxTest.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -29,34 +29,34 @@ class FMaxTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
2929
void testNaN(FMaxFunc func) {
3030
EXPECT_FP_EQ(inf, func(aNaN, inf));
3131
EXPECT_FP_EQ(neg_inf, func(neg_inf, aNaN));
32-
EXPECT_FP_EQ(0.0, func(aNaN, 0.0));
33-
EXPECT_FP_EQ(-0.0, func(-0.0, aNaN));
32+
EXPECT_FP_EQ(zero, func(aNaN, zero));
33+
EXPECT_FP_EQ(neg_zero, func(neg_zero, aNaN));
3434
EXPECT_FP_EQ(T(-1.2345), func(aNaN, T(-1.2345)));
3535
EXPECT_FP_EQ(T(1.2345), func(T(1.2345), aNaN));
3636
EXPECT_FP_EQ(aNaN, func(aNaN, aNaN));
3737
}
3838

3939
void testInfArg(FMaxFunc func) {
4040
EXPECT_FP_EQ(inf, func(neg_inf, inf));
41-
EXPECT_FP_EQ(inf, func(inf, 0.0));
42-
EXPECT_FP_EQ(inf, func(-0.0, inf));
41+
EXPECT_FP_EQ(inf, func(inf, zero));
42+
EXPECT_FP_EQ(inf, func(neg_zero, inf));
4343
EXPECT_FP_EQ(inf, func(inf, T(1.2345)));
4444
EXPECT_FP_EQ(inf, func(T(-1.2345), inf));
4545
}
4646

4747
void testNegInfArg(FMaxFunc func) {
4848
EXPECT_FP_EQ(inf, func(inf, neg_inf));
49-
EXPECT_FP_EQ(0.0, func(neg_inf, 0.0));
50-
EXPECT_FP_EQ(-0.0, func(-0.0, neg_inf));
49+
EXPECT_FP_EQ(zero, func(neg_inf, zero));
50+
EXPECT_FP_EQ(neg_zero, func(neg_zero, neg_inf));
5151
EXPECT_FP_EQ(T(-1.2345), func(neg_inf, T(-1.2345)));
5252
EXPECT_FP_EQ(T(1.2345), func(T(1.2345), neg_inf));
5353
}
5454

5555
void testBothZero(FMaxFunc func) {
56-
EXPECT_FP_EQ(0.0, func(0.0, 0.0));
57-
EXPECT_FP_EQ(0.0, func(-0.0, 0.0));
58-
EXPECT_FP_EQ(0.0, func(0.0, -0.0));
59-
EXPECT_FP_EQ(-0.0, func(-0.0, -0.0));
56+
EXPECT_FP_EQ(zero, func(zero, zero));
57+
EXPECT_FP_EQ(zero, func(neg_zero, zero));
58+
EXPECT_FP_EQ(zero, func(zero, neg_zero));
59+
EXPECT_FP_EQ(neg_zero, func(neg_zero, neg_zero));
6060
}
6161

6262
void testRange(FMaxFunc func) {

‎libc/test/src/math/FMinTest.h

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -30,34 +30,34 @@ class FMinTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
3030
void testNaN(FMinFunc func) {
3131
EXPECT_FP_EQ(inf, func(aNaN, inf));
3232
EXPECT_FP_EQ(neg_inf, func(neg_inf, aNaN));
33-
EXPECT_FP_EQ(0.0, func(aNaN, 0.0));
34-
EXPECT_FP_EQ(-0.0, func(-0.0, aNaN));
33+
EXPECT_FP_EQ(zero, func(aNaN, zero));
34+
EXPECT_FP_EQ(neg_zero, func(neg_zero, aNaN));
3535
EXPECT_FP_EQ(T(-1.2345), func(aNaN, T(-1.2345)));
3636
EXPECT_FP_EQ(T(1.2345), func(T(1.2345), aNaN));
3737
EXPECT_FP_EQ(aNaN, func(aNaN, aNaN));
3838
}
3939

4040
void testInfArg(FMinFunc func) {
4141
EXPECT_FP_EQ(neg_inf, func(neg_inf, inf));
42-
EXPECT_FP_EQ(0.0, func(inf, 0.0));
43-
EXPECT_FP_EQ(-0.0, func(-0.0, inf));
42+
EXPECT_FP_EQ(zero, func(inf, zero));
43+
EXPECT_FP_EQ(neg_zero, func(neg_zero, inf));
4444
EXPECT_FP_EQ(T(1.2345), func(inf, T(1.2345)));
4545
EXPECT_FP_EQ(T(-1.2345), func(T(-1.2345), inf));
4646
}
4747

4848
void testNegInfArg(FMinFunc func) {
4949
EXPECT_FP_EQ(neg_inf, func(inf, neg_inf));
50-
EXPECT_FP_EQ(neg_inf, func(neg_inf, 0.0));
51-
EXPECT_FP_EQ(neg_inf, func(-0.0, neg_inf));
50+
EXPECT_FP_EQ(neg_inf, func(neg_inf, zero));
51+
EXPECT_FP_EQ(neg_inf, func(neg_zero, neg_inf));
5252
EXPECT_FP_EQ(neg_inf, func(neg_inf, T(-1.2345)));
5353
EXPECT_FP_EQ(neg_inf, func(T(1.2345), neg_inf));
5454
}
5555

5656
void testBothZero(FMinFunc func) {
57-
EXPECT_FP_EQ(0.0, func(0.0, 0.0));
58-
EXPECT_FP_EQ(-0.0, func(-0.0, 0.0));
59-
EXPECT_FP_EQ(-0.0, func(0.0, -0.0));
60-
EXPECT_FP_EQ(-0.0, func(-0.0, -0.0));
57+
EXPECT_FP_EQ(zero, func(zero, zero));
58+
EXPECT_FP_EQ(neg_zero, func(neg_zero, zero));
59+
EXPECT_FP_EQ(neg_zero, func(zero, neg_zero));
60+
EXPECT_FP_EQ(neg_zero, func(neg_zero, neg_zero));
6161
}
6262

6363
void testRange(FMinFunc func) {

‎libc/test/src/math/FrexpTest.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,10 @@ class FrexpTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
3333
ASSERT_FP_EQ(inf, func(inf, &exponent));
3434
ASSERT_FP_EQ(neg_inf, func(neg_inf, &exponent));
3535

36-
ASSERT_FP_EQ(0.0, func(0.0, &exponent));
36+
ASSERT_FP_EQ(zero, func(zero, &exponent));
3737
ASSERT_EQ(exponent, 0);
3838

39-
ASSERT_FP_EQ(-0.0, func(-0.0, &exponent));
39+
ASSERT_FP_EQ(neg_zero, func(neg_zero, &exponent));
4040
ASSERT_EQ(exponent, 0);
4141
}
4242

‎libc/test/src/math/NextAfterTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
100100
expected_bits = min_subnormal + 1;
101101
expected = LIBC_NAMESPACE::cpp::bit_cast<T>(expected_bits);
102102
ASSERT_FP_EQ(result, expected);
103-
ASSERT_FP_EQ(func(x, 0), 0);
103+
ASSERT_FP_EQ(func(x, 0), zero);
104104

105105
x = -x;
106106
result = func(x, -1);

‎libc/test/src/math/exhaustive/exhaustive_test.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,8 @@ struct LlvmLibcExhaustiveMathTest
169169
range_end = stop;
170170
}
171171
current_value = range_end;
172-
int pc = 100.0 * (range_end - start) / (stop - start);
172+
int pc =
173+
static_cast<int>(100.0 * (range_end - start) / (stop - start));
173174
if (current_percent != pc) {
174175
new_percent = pc;
175176
current_percent = pc;

‎libc/test/src/math/exhaustive/fmod_generic_impl_test.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ class LlvmLibcFModTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
4848
int max2 = 3 + FPBits::MAX_BIASED_EXPONENT / 2;
4949
for (T by : TEST_BASES) {
5050
for (int iy = min2; iy < max2; iy++) {
51-
T y = by * LIBC_NAMESPACE::fputil::ldexp(2.0, iy);
51+
T y = by * LIBC_NAMESPACE::fputil::ldexp(T(2.0), iy);
5252
FPBits y_bits(y);
5353
if (y_bits.is_zero() || !y_bits.is_finite())
5454
continue;
5555
for (T bx : TEST_BASES) {
5656
for (int ix = min2; ix < max2; ix++) {
57-
T x = bx * LIBC_NAMESPACE::fputil::ldexp(2.0, ix);
57+
T x = bx * LIBC_NAMESPACE::fputil::ldexp(T(2.0), ix);
5858
if (!FPBits(x).is_finite())
5959
continue;
6060
T result = FMod::eval(x, y);

‎libc/test/src/math/smoke/NextAfterTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class NextAfterTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
115115
expected_bits = min_subnormal + 1;
116116
expected = LIBC_NAMESPACE::cpp::bit_cast<T>(expected_bits);
117117
ASSERT_FP_EQ_WITH_UNDERFLOW(result, expected);
118-
ASSERT_FP_EQ_WITH_UNDERFLOW(func(x, 0), 0);
118+
ASSERT_FP_EQ_WITH_UNDERFLOW(func(x, 0), zero);
119119

120120
x = -x;
121121
result = func(x, -1);

‎libc/test/src/math/smoke/NextTowardTest.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ class NextTowardTestTemplate : public LIBC_NAMESPACE::testing::FEnvSafeTest {
122122
expected_bits = min_subnormal + 1;
123123
expected = LIBC_NAMESPACE::cpp::bit_cast<T>(expected_bits);
124124
ASSERT_FP_EQ_WITH_UNDERFLOW(result, expected);
125-
ASSERT_FP_EQ_WITH_UNDERFLOW(func(x, 0), 0);
125+
ASSERT_FP_EQ_WITH_UNDERFLOW(func(x, 0), zero);
126126

127127
x = -x;
128128
result = func(x, -1);

‎libc/test/src/stdio/fileop_test.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ TEST(LlvmLibcFILETest, SimpleFileOperations) {
8787

8888
LIBC_NAMESPACE::libc_errno = 0;
8989
ASSERT_THAT(LIBC_NAMESPACE::fwrite("nothing", 1, 1, file),
90-
returns(EQ(0)).with_errno(NE(0)));
90+
returns(EQ(size_t(0))).with_errno(NE(0)));
9191
LIBC_NAMESPACE::libc_errno = 0;
9292

9393
ASSERT_EQ(LIBC_NAMESPACE::fclose(file), 0);

0 commit comments

Comments
 (0)