From: Ivan Maidanski <ivmai@mail.ru>
Date: Fri, 9 Nov 2018 08:14:02 +0000 (+0300)
Subject: Workaround 'local variable obj_displ shadows outer symbol' cppcheck warning
X-Git-Tag: v8.0.2~41
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=929655503a5e9e8fb3819f9c892cd1f839e97ca8;p=gc

Workaround 'local variable obj_displ shadows outer symbol' cppcheck warning
(fix of commit 8d64dbd10)

* include/private/gc_pmark.h [MARK_BIT_PER_OBJ] (GC_push_contents_hdr):
Do not declare obj_displ if MARK_BIT_PER_GRANULE.
---

diff --git a/include/private/gc_pmark.h b/include/private/gc_pmark.h
index fa425cdd..15e79860 100644
--- a/include/private/gc_pmark.h
+++ b/include/private/gc_pmark.h
@@ -317,7 +317,8 @@ GC_INLINE mse * GC_push_contents_hdr(ptr_t current, mse * mark_stack_top,
           if ((low_prod >> 16) != 0)
 #       endif /* MARK_BIT_PER_OBJ */
         {
-#         ifdef MARK_BIT_PER_OBJ
+#         if defined(MARK_BIT_PER_OBJ) \
+             && !defined(MARK_BIT_PER_GRANULE) /* for cppcheck */
             size_t obj_displ;
 
             /* Accurate enough if HBLKSIZE <= 2**15.    */