From ce8077bd4c4a1efcb8efeb959e2085854630da56 Mon Sep 17 00:00:00 2001 From: Vlad Brezae Date: Thu, 17 Dec 2015 03:46:00 +0200 Subject: [PATCH] [sgen] Use SGEN_ALIGN_UP in more places --- mono/metadata/sgen-mono.c | 5 +---- mono/sgen/sgen-descriptor.c | 5 +---- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/mono/metadata/sgen-mono.c b/mono/metadata/sgen-mono.c index f6ae431afde..2973647efa2 100644 --- a/mono/metadata/sgen-mono.c +++ b/mono/metadata/sgen-mono.c @@ -1400,10 +1400,7 @@ create_allocator (int atype, gboolean slowpath) int mono_gc_get_aligned_size_for_allocator (int size) { - int aligned_size = size; - aligned_size += SGEN_ALLOC_ALIGN - 1; - aligned_size &= ~(SGEN_ALLOC_ALIGN - 1); - return aligned_size; + return SGEN_ALIGN_UP (size); } /* diff --git a/mono/sgen/sgen-descriptor.c b/mono/sgen/sgen-descriptor.c index 177ba02c874..1d5b36637ee 100644 --- a/mono/sgen/sgen-descriptor.c +++ b/mono/sgen/sgen-descriptor.c @@ -123,10 +123,7 @@ mono_gc_make_descr_for_object (gsize *bitmap, int numbits, size_t obj_size) { int first_set = -1, num_set = 0, last_set = -1, i; SgenDescriptor desc = 0; - size_t stored_size = obj_size; - - stored_size += SGEN_ALLOC_ALIGN - 1; - stored_size &= ~(SGEN_ALLOC_ALIGN - 1); + size_t stored_size = SGEN_ALIGN_UP (obj_size); for (i = 0; i < numbits; ++i) { if (bitmap [i / GC_BITS_PER_WORD] & ((gsize)1 << (i % GC_BITS_PER_WORD))) { -- 2.25.1