Fix leaking native callback cache on thread exit

MoarVM · Mar 27, 2020 · 7748409 · 7748409
1 parent 2829898
commit 7748409
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/core/threadcontext.c b/src/core/threadcontext.c
@@ -119,6 +119,8 @@ void MVM_tc_destroy(MVMThreadContext *tc) {
         MVM_free(tc->temp_bigints[i]);
     }
 
+    MVM_HASH_DESTROY(tc, hash_handle, MVMNativeCallbackCacheHead, tc->native_callback_cache);
+
     /* Free the thread context itself. */
     memset(tc, 0xfe, sizeof(MVMThreadContext));
     MVM_free(tc);

diff --git a/src/jit/compile.c b/src/jit/compile.c
@@ -249,8 +249,8 @@ MVMJitCode* MVM_jit_code_copy(MVMThreadContext *tc, MVMJitCode * const code) {
 }
 
 void MVM_jit_code_destroy(MVMThreadContext *tc, MVMJitCode *code) {
-    /* fetch_and_sub1 returns previous value, therefore subtract 1 for the test */
-    if (AO_fetch_and_sub1(&code->ref_cnt) - 1 > 0)
+    /* fetch_and_sub1 returns previous value, so check if there's only 1 reference */
+    if (AO_fetch_and_sub1(&code->ref_cnt) > 1)
         return;
     MVM_platform_free_pages(code->func_ptr, code->size);
     MVM_free(code->labels);