Merge pull request JuliaLang#19911 from barche/c_finalizer

Run non-Julia finalizers at exit
armgong · Jan 19, 2017 · 4331b29 · 4331b29
2 parents d1ed1ff + 2044088
commit 4331b29
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 0 deletions.
diff --git a/src/ccalltest.c b/src/ccalltest.c
@@ -973,3 +973,7 @@ JL_DLLEXPORT float32x4_t test_ppc64_vec2(int64_t d1, float32x4_t a, float32x4_t
 JL_DLLEXPORT int threadcall_args(int a, int b) {
     return a + b;
 }
+
+JL_DLLEXPORT void c_exit_finalizer(void* v) {
+    printf("c_exit_finalizer: %d, %u", *(int*)v, (unsigned)((uintptr_t)v & (uintptr_t)1));
+}
diff --git a/src/gc.c b/src/gc.c
@@ -246,6 +246,9 @@ static void schedule_all_finalizers(arraylist_t *flist)
         if (!gc_ptr_tag(v, 1)) {
             schedule_finalization(v, f);
         }
+        else {
+            ((void (*)(void*))f)(gc_ptr_clear_tag(v, 1));
+        }
     }
     flist->len = 0;
 }

diff --git a/test/ccall.jl b/test/ccall.jl
@@ -798,6 +798,11 @@ let A = [1]
     @test ccall((:get_c_int, libccalltest), Cint, ()) == -1
 end
 
+# Pointer finalizer at exit (PR #19911)
+let result = readstring(`$(Base.julia_cmd()) --startup-file=no -e "A = Ref{Cint}(42); finalizer(A, cglobal((:c_exit_finalizer, \"$libccalltest\"), Void))"`)
+    @test result == "c_exit_finalizer: 42, 0"
+end
+
 # SIMD Registers
 
 typealias VecReg{N,T} NTuple{N,VecElement{T}}