Skip to content

Commit 21b9866

Browse files
authored
[libc] Fix arm32 tests (#74457)
`ASSERT_EQ` requires that both operands have the same type but on arm32 `size_t` is `unsigned int` instead of `unsigned long`. Using `size_t` explicitely to avoid "conflicting types for parameter 'ValType"
1 parent dd04e18 commit 21b9866

File tree

1 file changed

+7
-7
lines changed

1 file changed

+7
-7
lines changed

libc/test/src/__support/memory_size_test.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -75,21 +75,21 @@ TEST(LlvmLibcMemSizeTest, AlignUp) {
7575
auto safe_size = SafeMemSize{size};
7676
auto safe_aligned_size = safe_size.align_up(alignment);
7777
ASSERT_TRUE(safe_aligned_size.valid());
78-
ASSERT_EQ(static_cast<size_t>(safe_aligned_size) % alignment, size_t{0});
78+
ASSERT_EQ(static_cast<size_t>(safe_aligned_size) % alignment, size_t(0));
7979
}
8080
}
8181
auto max = SafeMemSize{SAFE_MEM_SIZE_TEST_LIMIT};
8282
ASSERT_FALSE(max.align_up(8).valid());
8383
}
8484

8585
TEST(LlvmLibcBlockBitTest, OffsetTo) {
86-
ASSERT_EQ(SafeMemSize::offset_to(0, 512), 0UL);
87-
ASSERT_EQ(SafeMemSize::offset_to(1, 512), 511UL);
88-
ASSERT_EQ(SafeMemSize::offset_to(2, 512), 510UL);
89-
ASSERT_EQ(SafeMemSize::offset_to(13, 1), 0UL);
90-
ASSERT_EQ(SafeMemSize::offset_to(13, 4), 3UL);
86+
ASSERT_EQ(SafeMemSize::offset_to(0, 512), size_t(0));
87+
ASSERT_EQ(SafeMemSize::offset_to(1, 512), size_t(511));
88+
ASSERT_EQ(SafeMemSize::offset_to(2, 512), size_t(510));
89+
ASSERT_EQ(SafeMemSize::offset_to(13, 1), size_t(0));
90+
ASSERT_EQ(SafeMemSize::offset_to(13, 4), size_t(3));
9191
for (unsigned int i = 0; i < 31; ++i) {
92-
ASSERT_EQ((SafeMemSize::offset_to(i, 1u << i) + i) % (1u << i), 0UL);
92+
ASSERT_EQ((SafeMemSize::offset_to(i, 1u << i) + i) % (1u << i), size_t(0));
9393
}
9494
}
9595
} // namespace internal

0 commit comments

Comments
 (0)