Eliminate 'GC_collecting is set but never used' code defect (Win32)

* include/private/gc_locks.h [USE_PTHREAD_LOCKS && GC_PTHREADS]
(GC_collecting): Do not declare if GC_WIN32_THREADS.
* include/private/gc_locks.h [USE_PTHREAD_LOCKS && GC_PTHREADS]
(ENTER_GC, EXIT_GC): Do not define if GC_WIN32_THREADS; remove
trailing ';', add cast to void.
* win32_threads.c [USE_PTHREAD_LOCKS] (GC_collecting): Remove definition.

diff --git a/include/private/gc_locks.h b/include/private/gc_locks.h
index 8cc1b835870dea2d9deb66dd8d95770705aa13ef..0062c796f01d7ddb7ffbe8f1f6f9c5428f8e7f11 100644 (file)
--- a/include/private/gc_locks.h
+++ b/include/private/gc_locks.h
@@ -187,9 +187,11 @@
                  || GC_lock_holder != NUMERIC_THREAD_ID(pthread_self()))
 #      endif
 #    endif /* GC_ASSERTIONS */
-     GC_EXTERN volatile GC_bool GC_collecting;
-#    define ENTER_GC() GC_collecting = 1;
-#    define EXIT_GC() GC_collecting = 0;
+#    ifndef GC_WIN32_THREADS
+       GC_EXTERN volatile GC_bool GC_collecting;
+#      define ENTER_GC() (void)(GC_collecting = TRUE)
+#      define EXIT_GC() (void)(GC_collecting = FALSE)
+#    endif
      GC_INNER void GC_lock(void);
 #  endif /* GC_PTHREADS */
 #  if defined(GC_ALWAYS_MULTITHREADED) \

diff --git a/win32_threads.c b/win32_threads.c
index 1527ba3cc87d376af9c4b7549b49a3d78f09c645..263ba5888a7338b7cd721af2f32602606c8e66a4 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -2838,11 +2838,6 @@ GC_INNER void GC_init_parallel(void)
   /* pthread_mutex_trylock may not win here,    */
   /* due to builtin support for spinning first? */
 
-  GC_INNER volatile GC_bool GC_collecting = 0;
-                        /* A hint that we're in the collector and       */
-                        /* holding the allocation lock for an           */
-                        /* extended period.                             */
-
   GC_INNER void GC_lock(void)
   {
     pthread_mutex_lock(&GC_allocate_ml);