diff options
| author | Jason Evans <je@fb.com> | 2016-03-11 10:11:56 -0800 |
|---|---|---|
| committer | Jason Evans <je@fb.com> | 2016-03-11 10:11:56 -0800 |
| commit | 824b947be08e87e0c317f585c250731897c2aa2c (patch) | |
| tree | 63a250a18c3245ab951fe405df1846a75d2715af /test | |
| parent | ca18f2834e17f31551f871cf4ca487aa9249614e (diff) | |
| download | jemalloc-824b947be08e87e0c317f585c250731897c2aa2c.tar.gz | |
Add (size_t) casts to MALLOCX_ALIGN().
Add (size_t) casts to MALLOCX_ALIGN() macros so that passing the integer
constant 0x80000000 does not cause a compiler warning about invalid
shift amount.
This resolves #354.
Diffstat (limited to 'test')
| -rw-r--r-- | test/integration/mallocx.c | 23 |
1 files changed, 10 insertions, 13 deletions
diff --git a/test/integration/mallocx.c b/test/integration/mallocx.c index 42eee10..d82bf42 100644 --- a/test/integration/mallocx.c +++ b/test/integration/mallocx.c @@ -69,18 +69,14 @@ TEST_END TEST_BEGIN(test_oom) { - size_t hugemax, size, alignment; - - hugemax = get_huge_size(get_nhuge()-1); /* * It should be impossible to allocate two objects that each consume * more than half the virtual address space. */ { - void *p; - - p = mallocx(hugemax, 0); + size_t hugemax = get_huge_size(get_nhuge()-1); + void *p = mallocx(hugemax, 0); if (p != NULL) { assert_ptr_null(mallocx(hugemax, 0), "Expected OOM for mallocx(size=%#zx, 0)", hugemax); @@ -89,15 +85,16 @@ TEST_BEGIN(test_oom) } #if LG_SIZEOF_PTR == 3 - size = ZU(0x8000000000000000); - alignment = ZU(0x8000000000000000); + assert_ptr_null(mallocx(0x8000000000000000ULL, + MALLOCX_ALIGN(0x8000000000000000ULL)), + "Expected OOM for mallocx()"); + assert_ptr_null(mallocx(0x8000000000000000ULL, + MALLOCX_ALIGN(0x80000000)), + "Expected OOM for mallocx()"); #else - size = ZU(0x80000000); - alignment = ZU(0x80000000); + assert_ptr_null(mallocx(0x80000000UL, MALLOCX_ALIGN(0x80000000UL)), + "Expected OOM for mallocx()"); #endif - assert_ptr_null(mallocx(size, MALLOCX_ALIGN(alignment)), - "Expected OOM for mallocx(size=%#zx, MALLOCX_ALIGN(%#zx)", size, - alignment); } TEST_END |