Workaround 'variable reassigned before old value used' cppcheck warnings

* misc.c (GC_call_with_gc_active): Call GC_noop1 for
GC_traced_stack_sect and GC_blocked_sp (before restoring their original
values) if CPPCHECK.
* win32_threads.c (GC_do_blocking_inner): Call GC_noop1 for
thread_blocked_sp field (before restoring its original value)
if CPPCHECK.
* win32_threads.c (GC_call_with_gc_active): Call GC_noop1 for
traced_stack_sect field (before restoring its original value)
if CPPCHECK.

diff --git a/misc.c b/misc.c
index 9fc72c5fd95858e4f6898db543f8368cba3a7547..c9b1e1f3360d7c19bac51f858544d206f5bc8a0c 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -1988,6 +1988,9 @@ GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
     GC_ASSERT(GC_blocked_sp == NULL);
     GC_ASSERT(GC_traced_stack_sect == &stacksect);
 
+#   if defined(CPPCHECK)
+      GC_noop1((word)GC_traced_stack_sect - (word)GC_blocked_sp);
+#   endif
     /* Restore original "stack section".        */
     GC_traced_stack_sect = stacksect.prev;
 #   ifdef IA64
@@ -2019,6 +2022,9 @@ STATIC void GC_do_blocking_inner(ptr_t data, void * context GC_ATTR_UNUSED)
         GC_ASSERT(GC_blocked_sp != NULL);
 #   else
         GC_ASSERT(GC_blocked_sp == (ptr_t) &d);
+#   endif
+#   if defined(CPPCHECK)
+      GC_noop1((word)GC_blocked_sp);
 #   endif
     GC_blocked_sp = NULL;
 }

diff --git a/win32_threads.c b/win32_threads.c
index 124f4decf660be7cdaf2e78c02e8a80d9b46b280..c4d946205e45ba8901f37c5aa553a1b540a7176c 100644 (file)
--- a/win32_threads.c
+++ b/win32_threads.c
@@ -877,6 +877,9 @@ GC_INNER void GC_do_blocking_inner(ptr_t data, void * context GC_ATTR_UNUSED)
   UNLOCK();
   d -> client_data = (d -> fn)(d -> client_data);
   LOCK();   /* This will block if the world is stopped. */
+# if defined(CPPCHECK)
+    GC_noop1((word)me->thread_blocked_sp);
+# endif
   me -> thread_blocked_sp = NULL;
   UNLOCK();
 }
@@ -931,6 +934,9 @@ GC_API void * GC_CALL GC_call_with_gc_active(GC_fn_type fn,
 
   /* Restore original "stack section".  */
   LOCK();
+# if defined(CPPCHECK)
+    GC_noop1((word)me->traced_stack_sect);
+# endif
   me -> traced_stack_sect = stacksect.prev;
 # ifdef IA64
     me -> backing_store_ptr = stacksect.saved_backing_store_ptr;