RepoMirrors/gperftools
1
0
Fork 0
mirror of https://github.com/gperftools/gperftools synced 2025-02-04 13:41:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

tcmalloc_unittest: do 64-bit shift when computing alignment

Browse Source 
Thanks goes to MSVC for warning about this.
This commit is contained in:
Aliaksey Kandratsenka 2024-02-04 14:22:33 -05:00
parent 329e9adfa6
commit c56764c3e6
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/tests/tcmalloc_unittest.cc
View File

@ -342,7 +342,7 @@ class AllocatorState : public TestHarness {
if (Uniform(100) < memalign_fraction_ * 100) { if (Uniform(100) < memalign_fraction_ * 100) {
// Try a few times to find a reasonable alignment, or fall back on malloc. // Try a few times to find a reasonable alignment, or fall back on malloc.
for (int i = 0; i < 5; i++) { for (int i = 0; i < 5; i++) {
size_t alignment = 1 << Uniform(FLAGS_lg_max_memalign); size_t alignment = size_t{1} << Uniform(FLAGS_lg_max_memalign);
if (alignment >= sizeof(intptr_t) && if (alignment >= sizeof(intptr_t) &&
(size < sizeof(intptr_t) || (size < sizeof(intptr_t) ||
alignment < FLAGS_memalign_max_alignment_ratio * size)) { alignment < FLAGS_memalign_max_alignment_ratio * size)) {
@ -1137,11 +1137,12 @@ static void TestNAllocX() {
static void TestNAllocXAlignment() { static void TestNAllocXAlignment() {
for (size_t size = 0; size <= (1 << 20); size = GrowNallocxTestSize(size)) { for (size_t size = 0; size <= (1 << 20); size = GrowNallocxTestSize(size)) {
for (size_t align = 0; align < 10; align++) { for (size_t align_log = 0; align_log < 10; align_log++) {
size_t rounded = nallocx(size, MALLOCX_LG_ALIGN(align)); size_t rounded = nallocx(size, MALLOCX_LG_ALIGN(align_log));
size_t align = size_t{1} << align_log;
ASSERT_GE(rounded, size); ASSERT_GE(rounded, size);
ASSERT_EQ(rounded % (1 << align), 0); ASSERT_EQ(rounded % align, 0);
void* ptr = tc_memalign(1 << align, size); void* ptr = tc_memalign(align, size);
ASSERT_EQ(rounded, MallocExtension::instance()->GetAllocatedSize(ptr)); ASSERT_EQ(rounded, MallocExtension::instance()->GetAllocatedSize(ptr));
free(ptr); free(ptr);
} }