From 9cd4c2f2d3bf68a98210024dfd573c8b50ff41d6 Mon Sep 17 00:00:00 2001 From: Ivan Maidanski Date: Thu, 30 Jun 2016 10:20:53 +0300 Subject: Revert "Refactoring of GC_Xobjfreelist" partially This reverts commit 41871b970c8fd9704835c1a221a8f9f1deea707a partially (GC_malloc_kind_global, GC_generic_malloc_uncollectable, GC_destroy_thread_local are not reverted). --- thread_local_alloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'thread_local_alloc.c') diff --git a/thread_local_alloc.c b/thread_local_alloc.c index ab4382b6..1e000794 100644 --- a/thread_local_alloc.c +++ b/thread_local_alloc.c @@ -138,7 +138,7 @@ GC_INNER void GC_destroy_thread_local(GC_tlfs p) /* We currently only do this from the thread itself or from */ /* the fork handler for a child process. */ - GC_STATIC_ASSERT(PREDEFINED_KINDS >= THREAD_FREELISTS_KINDS); + GC_STATIC_ASSERT(THREAD_FREELISTS_KINDS <= MAXOBJKINDS); for (k = 0; k < THREAD_FREELISTS_KINDS; ++k) { if (k == (int)GC_n_kinds) break; /* kind is not created */ @@ -164,7 +164,7 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_malloc_kind(size_t bytes, int knd) void *tsd; void *result; -# if PREDEFINED_KINDS > THREAD_FREELISTS_KINDS +# if MAXOBJKINDS > THREAD_FREELISTS_KINDS if (EXPECT(knd >= THREAD_FREELISTS_KINDS, FALSE)) { return GC_malloc_kind_global(bytes, knd); } -- cgit v1.2.1