Make GC_INIT optional for clients even if thread-local allocations enabled

* tests/test.c (GC_OPT_INIT): Do not define to GC_INIT() even if
THREAD_LOCAL_ALLOC; force define to GC_INIT() if TEST_EXPLICIT_GC_INIT
macro defined.
* thread_local_alloc.c [USE_PTHREAD_SPECIFIC || USE_WIN32_SPECIFIC]
(GC_malloc_kind): Check keys_initialized before GC_getspecific call
(fall back to GC_malloc_kind_global if keys_initialized is false).

diff --git a/tests/test.c b/tests/test.c
index b3b455c3b120e026398826d6e38cbb7630944646..ef7e8095d135ab83cd885a5022a953d57884ae46 100644 (file)
--- a/tests/test.c
+++ b/tests/test.c
@@ -135,8 +135,8 @@
 
 /* Call GC_INIT only on platforms on which we think we really need it,  */
 /* so that we can test automatic initialization on the rest.            */
-#if defined(CYGWIN32) || defined (AIX) || defined(DARWIN) \
-        || defined(PLATFORM_ANDROID) || defined(THREAD_LOCAL_ALLOC) \
+#if defined(TEST_EXPLICIT_GC_INIT) || defined(AIX) || defined(CYGWIN32) \
+        || defined(DARWIN) || defined(PLATFORM_ANDROID) \
         || (defined(MSWINCE) && !defined(GC_WINMAIN_REDIRECT))
 #  define GC_OPT_INIT GC_INIT()
 #else

diff --git a/thread_local_alloc.c b/thread_local_alloc.c
index 0919935d28f5aae476206f9013b181aa9dbc4811..aacd855e14d7f1e8bd4c8e8e2888363a03404b3e 100644 (file)
--- a/thread_local_alloc.c
+++ b/thread_local_alloc.c
@@ -170,6 +170,8 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_malloc_kind(size_t bytes, int knd)
       tsd = GC_getspecific(k);
     }
 #   else
+      if (!EXPECT(keys_initialized, TRUE))
+        return GC_malloc_kind_global(bytes, knd);
       tsd = GC_getspecific(GC_thread_key);
 #   endif
 #   if !defined(USE_COMPILER_TLS) && !defined(USE_WIN32_COMPILER_TLS)