Skip to content

Commit 8bd8007

Browse files
vinay-deshmukhvinay-deshmukh
committed
more
1 parent d4892ff commit 8bd8007

File tree

6 files changed

+24
-23
lines changed

6 files changed

+24
-23
lines changed

‎libc/src/stdio/scanf_core/parser.h‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ template <typename ArgProvider> class Parser {
153153
scan_set.set_range(static_cast<size_t>(start), static_cast<size_t>(end));
154154
cur_pos += 2;
155155
} else {
156-
scan_set.set(str[cur_pos]);
156+
scan_set.set(static_cast<size_t>(str[cur_pos]));
157157
++cur_pos;
158158
}
159159
}
@@ -237,8 +237,8 @@ template <typename ArgProvider> class Parser {
237237
LIBC_INLINE size_t parse_index(size_t *local_pos) {
238238
if (internal::isdigit(str[*local_pos])) {
239239
auto result = internal::strtointeger<int>(str + *local_pos, 10);
240-
size_t index = result.value;
241-
if (str[*local_pos + result.parsed_len] != '$')
240+
size_t index = static_cast<size_t>(result.value);
241+
if (str[*local_pos + static_cast<size_t>(result.parsed_len)] != '$')
242242
return 0;
243243
*local_pos = 1 + result.parsed_len + *local_pos;
244244
return index;

‎libc/src/string/memory_utils/utils.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919

2020
#include <stddef.h> // size_t
2121
#include <stdint.h> // intptr_t / uintptr_t / INT32_MAX / INT32_MIN
22+
#include <sys/_types/_uintptr_t.h>
2223

2324
namespace LIBC_NAMESPACE_DECL {
2425

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

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
5454

5555
// fmod (+inf, y) == aNaN plus invalid exception.
5656
TEST_SPECIAL(inf, 3.0, aNaN, true, FE_INVALID);
57-
TEST_SPECIAL(inf, -1.1L, aNaN, true, FE_INVALID);
57+
TEST_SPECIAL(inf, static_cast<float>(-1.1L), aNaN, true, FE_INVALID);
5858
TEST_SPECIAL(inf, 0.0, aNaN, true, FE_INVALID);
5959
TEST_SPECIAL(inf, neg_zero, aNaN, true, FE_INVALID);
6060
TEST_SPECIAL(inf, min_denormal, aNaN, true, FE_INVALID);
@@ -65,7 +65,7 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
6565

6666
// fmod (-inf, y) == aNaN plus invalid exception.
6767
TEST_SPECIAL(neg_inf, 3.0, aNaN, true, FE_INVALID);
68-
TEST_SPECIAL(neg_inf, -1.1L, aNaN, true, FE_INVALID);
68+
TEST_SPECIAL(neg_inf, static_cast<float>(-1.1L), aNaN, true, FE_INVALID);
6969
TEST_SPECIAL(neg_inf, 0.0, aNaN, true, FE_INVALID);
7070
TEST_SPECIAL(neg_inf, neg_zero, aNaN, true, FE_INVALID);
7171
TEST_SPECIAL(neg_inf, min_denormal, aNaN, true, FE_INVALID);
@@ -76,7 +76,7 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
7676

7777
// fmod (x, +0) == aNaN plus invalid exception.
7878
TEST_SPECIAL(3.0, 0.0, aNaN, true, FE_INVALID);
79-
TEST_SPECIAL(-1.1L, 0.0, aNaN, true, FE_INVALID);
79+
TEST_SPECIAL(static_cast<float>(-1.1L), 0.0, aNaN, true, FE_INVALID);
8080
TEST_SPECIAL(0.0, 0.0, aNaN, true, FE_INVALID);
8181
TEST_SPECIAL(neg_zero, 0.0, aNaN, true, FE_INVALID);
8282
TEST_SPECIAL(min_denormal, 0.0, aNaN, true, FE_INVALID);
@@ -85,7 +85,7 @@ class FmodTest : public LIBC_NAMESPACE::testing::FEnvSafeTest {
8585

8686
// fmod (x, -0) == aNaN plus invalid exception.
8787
TEST_SPECIAL(3.0, neg_zero, aNaN, true, FE_INVALID);
88-
TEST_SPECIAL(-1.1L, neg_zero, aNaN, true, FE_INVALID);
88+
TEST_SPECIAL(static_cast<float>(-1.1L), neg_zero, aNaN, true, FE_INVALID);
8989
TEST_SPECIAL(0.0, neg_zero, aNaN, true, FE_INVALID);
9090
TEST_SPECIAL(neg_zero, neg_zero, aNaN, true, FE_INVALID);
9191
TEST_SPECIAL(min_denormal, neg_zero, aNaN, true, FE_INVALID);

‎libc/test/src/stdio/printf_core/parser_test.cpp‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithPrecision) {
166166

167167
expected.raw_string = {str, 5};
168168
expected.precision = 34;
169-
expected.conv_val_raw = arg1;
169+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
170170
expected.conv_name = 'd';
171171

172172
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -183,7 +183,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithTrivialPrecision) {
183183

184184
expected.raw_string = {str, 3};
185185
expected.precision = 0;
186-
expected.conv_val_raw = arg1;
186+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
187187
expected.conv_name = 'd';
188188

189189
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -200,7 +200,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithShortLengthModifier) {
200200

201201
expected.raw_string = {str, 3};
202202
expected.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::h;
203-
expected.conv_val_raw = arg1;
203+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
204204
expected.conv_name = 'd';
205205

206206
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -217,7 +217,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithLongLengthModifier) {
217217

218218
expected.raw_string = {str, 4};
219219
expected.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::ll;
220-
expected.conv_val_raw = arg1;
220+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
221221
expected.conv_name = 'd';
222222

223223
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -235,7 +235,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithBitWidthLengthModifier) {
235235
expected.raw_string = {str, 5};
236236
expected.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::w;
237237
expected.bit_width = 32;
238-
expected.conv_val_raw = arg1;
238+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
239239
expected.conv_name = 'd';
240240

241241
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -253,7 +253,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithFastBitWidthLengthModifier) {
253253
expected.raw_string = {str, 6};
254254
expected.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::wf;
255255
expected.bit_width = 32;
256-
expected.conv_val_raw = arg1;
256+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
257257
expected.conv_name = 'd';
258258

259259
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -276,7 +276,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithAllOptions) {
276276
expected.min_width = 56;
277277
expected.precision = 78;
278278
expected.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::j;
279-
expected.conv_val_raw = arg1;
279+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
280280
expected.conv_name = 'd';
281281

282282
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -294,7 +294,7 @@ TEST(LlvmLibcPrintfParserTest, EvalThreeArgs) {
294294
expected0.has_conv = true;
295295

296296
expected0.raw_string = {str, 2};
297-
expected0.conv_val_raw = arg1;
297+
expected0.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
298298
expected0.conv_name = 'd';
299299

300300
ASSERT_PFORMAT_EQ(expected0, format_arr[0]);
@@ -329,7 +329,7 @@ TEST(LlvmLibcPrintfParserTest, EvalOneArgWithOverflowingWidthAndPrecision) {
329329
expected.flags = LIBC_NAMESPACE::printf_core::FormatFlags::LEFT_JUSTIFIED;
330330
expected.min_width = INT_MAX;
331331
expected.precision = INT_MAX;
332-
expected.conv_val_raw = arg1;
332+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
333333
expected.conv_name = 'd';
334334

335335
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -351,7 +351,7 @@ TEST(LlvmLibcPrintfParserTest,
351351
expected.flags = LIBC_NAMESPACE::printf_core::FormatFlags::LEFT_JUSTIFIED;
352352
expected.min_width = INT_MAX;
353353
expected.precision = arg2;
354-
expected.conv_val_raw = arg3;
354+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg3);
355355
expected.conv_name = 'd';
356356

357357
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -369,7 +369,7 @@ TEST(LlvmLibcPrintfParserTest, IndexModeOneArg) {
369369
expected.has_conv = true;
370370

371371
expected.raw_string = {str, 4};
372-
expected.conv_val_raw = arg1;
372+
expected.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
373373
expected.conv_name = 'd';
374374

375375
ASSERT_PFORMAT_EQ(expected, format_arr[0]);
@@ -387,7 +387,7 @@ TEST(LlvmLibcPrintfParserTest, IndexModeThreeArgsSequential) {
387387
expected0.has_conv = true;
388388

389389
expected0.raw_string = {str, 4};
390-
expected0.conv_val_raw = arg1;
390+
expected0.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
391391
expected0.conv_name = 'd';
392392

393393
ASSERT_PFORMAT_EQ(expected0, format_arr[0]);
@@ -421,7 +421,7 @@ TEST(LlvmLibcPrintfParserTest, IndexModeThreeArgsReverse) {
421421
expected0.has_conv = true;
422422

423423
expected0.raw_string = {str, 4};
424-
expected0.conv_val_raw = arg1;
424+
expected0.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg1);
425425
expected0.conv_name = 'd';
426426

427427
ASSERT_PFORMAT_EQ(expected0, format_arr[0]);
@@ -485,7 +485,7 @@ TEST(LlvmLibcPrintfParserTest, IndexModeComplexParsing) {
485485

486486
expected1.raw_string = {str + 12, 6};
487487
expected1.length_modifier = LIBC_NAMESPACE::printf_core::LengthModifier::ll;
488-
expected1.conv_val_raw = arg3;
488+
expected1.conv_val_raw = static_cast<LIBC_NAMESPACE::fputil::FPBits<double>::StorageType>(arg3);
489489
expected1.conv_name = 'u';
490490

491491
EXPECT_PFORMAT_EQ(expected1, format_arr[1]);

‎libc/test/src/string/memmove_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ TEST(LlvmLibcMemmoveTest, SizeSweep) {
9393
Randomize(Buffer);
9494
for (int Size = 0; Size < kMaxSize; ++Size)
9595
for (int Overlap = -1; Overlap < Size;) {
96-
ASSERT_TRUE(CheckMemmove<Adaptor>(Buffer, Size, Overlap));
96+
ASSERT_TRUE(CheckMemmove<Adaptor>(Buffer, static_cast<size_t>(Size), Overlap));
9797
// Prevent quadratic behavior by skipping offset above kDenseOverlap.
9898
if (Overlap > kDenseOverlap)
9999
Overlap *= 2;

‎libc/test/src/string/memset_test.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ TEST(LlvmLibcMemsetTest, SizeSweep) {
2727
static constexpr size_t kMaxSize = 400;
2828
Buffer DstBuffer(kMaxSize);
2929
for (size_t size = 0; size < kMaxSize; ++size) {
30-
const char value = size % 10;
30+
const uint8_t value = size % 10;
3131
auto dst = DstBuffer.span().subspan(0, size);
3232
ASSERT_TRUE((CheckMemset<Adaptor>(dst, value, size)));
3333
}

0 commit comments

Comments
 (0)