From: Ivan Maidanski <ivmai@mail.ru>
Date: Mon, 18 Jun 2018 21:50:07 +0000 (+0300)
Subject: Remove duplicate local variable in reclaim_block
X-Git-Tag: v8.0.0~116
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=24c2987d73ba0c3b5ae762e59238628785770c13;p=gc

Remove duplicate local variable in reclaim_block
(fix of commit 6c1a92445)

* reclaim.c [ENABLE_DISCLAIM] (GC_reclaim_block): Remove duplicate ok
local variable definition (which hides the one in the outermost block
and has the same value).
---

diff --git a/reclaim.c b/reclaim.c
index d50369e4..d17881a2 100644
--- a/reclaim.c
+++ b/reclaim.c
@@ -399,7 +399,6 @@ STATIC void GC_reclaim_block(struct hblk *hbp, word report_if_found)
 
 #             ifdef ENABLE_DISCLAIM
                 if (EXPECT(hhdr->hb_flags & HAS_DISCLAIM, 0)) {
-                  struct obj_kind *ok = &GC_obj_kinds[hhdr->hb_obj_kind];
                   if ((*ok->ok_disclaim_proc)(hbp)) {
                     /* Not disclaimed => resurrect the object. */
                     set_mark_bit_from_hdr(hhdr, 0);