From: Petter Urkedal <paurkedal@gmail.com>
Date: Tue, 18 Sep 2018 21:23:47 +0000 (+0300)
Subject: Fix marking of finalizer closure object
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=21312a008f7b68f31d28d347cd3f9161e4da1ae6;p=gc

Fix marking of finalizer closure object

* fnlz_mlc.c [ENABLE_DISCLAIM] (GC_init_finalized_malloc): Call
GC_register_displacement_inner(FINALIZER_CLOSURE_FLAG); add comment.
* fnlz_mlc.c [ENABLE_DISCLAIM] (GC_finalized_malloc): Call GC_dirty and
REACHABLE_AFTER_DIRTY after storing fclos.
---

diff --git a/fnlz_mlc.c b/fnlz_mlc.c
index 3d6244aa..7728ca12 100644
--- a/fnlz_mlc.c
+++ b/fnlz_mlc.c
@@ -67,6 +67,10 @@ GC_API void GC_CALL GC_init_finalized_malloc(void)
     /* start of the user region.                                        */
     GC_register_displacement_inner(sizeof(word));
 
+    /* And, the pointer to the finalizer closure object itself is       */
+    /* displaced due to baking in this indicator.                       */
+    GC_register_displacement_inner(FINALIZER_CLOSURE_FLAG);
+
     GC_finalized_kind = GC_new_kind_inner(GC_new_free_list_inner(),
                                           GC_DS_LENGTH, TRUE, TRUE);
     GC_ASSERT(GC_finalized_kind != 0);
@@ -96,6 +100,8 @@ GC_API GC_ATTR_MALLOC void * GC_CALL GC_finalized_malloc(size_t lb,
     if (EXPECT(NULL == op, FALSE))
         return NULL;
     *op = (word)fclos | FINALIZER_CLOSURE_FLAG;
+    GC_dirty(op);
+    REACHABLE_AFTER_DIRTY(fclos);
     return op + 1;
 }