Imported Upstream version 1.9.0+dfsg1

[rustc.git] / src / jemalloc / test / unit / bitmap.c

diff --git a/src/jemalloc/test/unit/bitmap.c b/src/jemalloc/test/unit/bitmap.c
index 4ea94f8575215b76844591c5804bb62ecff08417..1ab0bb8ebce785a91dbe9b552bc973c51cf70949 100644 (file)
--- a/src/jemalloc/test/unit/bitmap.c
+++ b/src/jemalloc/test/unit/bitmap.c
@@ -6,7 +6,11 @@ TEST_BEGIN(test_bitmap_size)
 
        prev_size = 0;
        for (i = 1; i <= BITMAP_MAXBITS; i++) {
-               size_t size = bitmap_size(i);
+               bitmap_info_t binfo;
+               size_t size;
+
+               bitmap_info_init(&binfo, i);
+               size = bitmap_size(&binfo);
                assert_true(size >= prev_size,
                    "Bitmap size is smaller than expected");
                prev_size = size;
@@ -23,8 +27,8 @@ TEST_BEGIN(test_bitmap_init)
                bitmap_info_init(&binfo, i);
                {
                        size_t j;
-                       bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
-                               bitmap_info_ngroups(&binfo));
+                       bitmap_t *bitmap = (bitmap_t *)malloc(
+                           bitmap_size(&binfo));
                        bitmap_init(bitmap, &binfo);
 
                        for (j = 0; j < i; j++) {
@@ -46,8 +50,8 @@ TEST_BEGIN(test_bitmap_set)
                bitmap_info_init(&binfo, i);
                {
                        size_t j;
-                       bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
-                               bitmap_info_ngroups(&binfo));
+                       bitmap_t *bitmap = (bitmap_t *)malloc(
+                           bitmap_size(&binfo));
                        bitmap_init(bitmap, &binfo);
 
                        for (j = 0; j < i; j++)
@@ -69,8 +73,8 @@ TEST_BEGIN(test_bitmap_unset)
                bitmap_info_init(&binfo, i);
                {
                        size_t j;
-                       bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
-                               bitmap_info_ngroups(&binfo));
+                       bitmap_t *bitmap = (bitmap_t *)malloc(
+                           bitmap_size(&binfo));
                        bitmap_init(bitmap, &binfo);
 
                        for (j = 0; j < i; j++)
@@ -98,8 +102,8 @@ TEST_BEGIN(test_bitmap_sfu)
                bitmap_info_init(&binfo, i);
                {
                        ssize_t j;
-                       bitmap_t *bitmap = malloc(sizeof(bitmap_t) *
-                               bitmap_info_ngroups(&binfo));
+                       bitmap_t *bitmap = (bitmap_t *)malloc(
+                           bitmap_size(&binfo));
                        bitmap_init(bitmap, &binfo);
 
                        /* Iteratively set bits starting at the beginning. */