Temporary fix to make sure GC while holding a lock will not dead lock.

Add tests.

Author: yuyichao

base/locks.jl

@@ -23,6 +23,11 @@ function lock!(l::TatasLock)
             end
         end
         ccall(:jl_cpu_pause, Void, ())
+        # Temporary solution before we have gc transition support in codegen.
+        # This could mess up gc state when we add codegen support.
+        # Use these as a safe point
+        gc_state = ccall(:jl_gc_safe_enter, Int8, ())
+        ccall(:jl_gc_safe_leave, Void, (Int8,), gc_state)
     end
 end
 
@@ -61,6 +66,11 @@ function lock!(l::RecursiveTatasLock)
             end
         end
         ccall(:jl_cpu_pause, Void, ())
+        # Temporary solution before we have gc transition support in codegen.
+        # This could mess up gc state when we add codegen support.
+        # Use these as a safe point
+        gc_state = ccall(:jl_gc_safe_enter, Int8, ())
+        ccall(:jl_gc_safe_leave, Void, (Int8,), gc_state)
     end
 end
 
@@ -116,7 +126,11 @@ function lock!(m::Mutex)
     if m.ownertid == threadid()
         return 0
     end
+    # Temporary solution before we have gc transition support in codegen.
+    # This could mess up gc state when we add codegen support.
+    gc_state = ccall(:jl_gc_safe_enter, Int8, ())
     ccall(:uv_mutex_lock, Void, (Ptr{Void},), m.handle)
+    ccall(:jl_gc_safe_leave, Void, (Int8,), gc_state)
     m.ownertid = threadid()
     return 0
 end

src/jlapi.c

@@ -328,6 +328,16 @@ JL_DLLEXPORT void (jl_gc_unsafe_leave)(int8_t state)
     jl_gc_unsafe_leave(state);
 }
 
+JL_DLLEXPORT int8_t (jl_gc_safe_enter)(void)
+{
+    return jl_gc_state_save_and_set(3);
+}
+
+JL_DLLEXPORT void (jl_gc_safe_leave)(int8_t state)
+{
+    jl_gc_state_set(state, 3);
+}
+
 #ifdef __cplusplus
 }
 #endif

test/threads.jl

@@ -83,3 +83,18 @@ let lock = Threads.RecursiveSpinLock()
     @test unlock!(lock) == 0
     @test unlock!(lock) == 1
 end
+
+# Make sure doing a GC while holding a lock doesn't cause dead lock
+# PR 14190. (This is only meaningful for threading)
+function threaded_gc_locked{LockT}(::Type{LockT})
+    lock = LockT()
+    @threads for i = 1:20
+        lock!(lock)
+        gc(false)
+        unlock!(lock)
+    end
+end
+
+threaded_gc_locked(SpinLock)
+threaded_gc_locked(Threads.RecursiveSpinLock)
+threaded_gc_locked(Mutex)