Move locking to C

Author: timholy

Compiler/src/typeinfer.jl

@@ -1557,13 +1557,10 @@ function add_codeinsts_to_jit!(interp::AbstractInterpreter, ci, source_mode::UIn
     return ci
 end
 
-const collect_dispatch_backtrace = fill(false)
-function store_dispatch_backtrace end
-
 function typeinf_ext_toplevel(interp::AbstractInterpreter, mi::MethodInstance, source_mode::UInt8)
     ci = typeinf_ext(interp, mi, source_mode)
-    if isa(ci, CodeInstance) && collect_dispatch_backtrace[]
-        Core.invokelatest(store_dispatch_backtrace, ci)
+    if isa(ci, CodeInstance) && ccall(:jl_recording_inference_entrance_backtraces, Cint, ()) != 0
+        ccall(:jl_push_inference_entrance_backtraces, Cvoid, (Any,), ci => backtrace())
     end
     ci = add_codeinsts_to_jit!(interp, ci, source_mode)
     return ci

base/loading.jl

@@ -4246,4 +4246,3 @@ precompile(include_package_for_output, (PkgId, String, Vector{String}, Vector{St
 precompile(include_package_for_output, (PkgId, String, Vector{String}, Vector{String}, Vector{String}, typeof(_concrete_dependencies), String)) || @assert false
 precompile(create_expr_cache, (PkgId, String, String, String, typeof(_concrete_dependencies), Cmd, CacheFlags, IO, IO)) || @assert false
 precompile(create_expr_cache, (PkgId, String, String, Nothing, typeof(_concrete_dependencies), Cmd, CacheFlags, IO, IO)) || @assert false
-precompile(Compiler.store_dispatch_backtrace, (Core.CodeInstance,))

base/stacktraces.jl

@@ -376,14 +376,3 @@ function from(frame::StackFrame, m::Module)
 end
 
 end  # module StackTraces
-
-# Back to Base
-# Implement locking for Compiler.store_dispatch_backtrace
-const dispatch_backtrace = IdDict{Core.CodeInstance,Any}()
-const dispatch_backtrace_lock = ReentrantLock()
-
-function Compiler.store_dispatch_backtrace(ci::Core.CodeInstance)
-    lock(dispatch_backtrace_lock) do
-        dispatch_backtrace[ci] = backtrace()
-    end
-end

src/julia.h

@@ -2245,6 +2245,9 @@ JL_DLLEXPORT jl_value_t *jl_object_top_module(jl_value_t* v) JL_NOTSAFEPOINT;
 
 JL_DLLEXPORT void jl_set_newly_inferred(jl_value_t *newly_inferred);
 JL_DLLEXPORT void jl_push_newly_inferred(jl_value_t *ci);
+JL_DLLEXPORT void jl_set_inference_entrance_backtraces(jl_value_t *inference_entrance_backtraces);
+JL_DLLEXPORT int jl_recording_inference_entrance_backtraces(void);
+JL_DLLEXPORT void jl_push_inference_entrance_backtraces(jl_value_t *ci_bt_pair);
 JL_DLLEXPORT void jl_write_compiler_output(void);
 
 // parsing

src/staticdata_utils.c

@@ -131,6 +131,35 @@ JL_DLLEXPORT void jl_push_newly_inferred(jl_value_t* ci)
     JL_UNLOCK(&newly_inferred_mutex);
 }
 
+
+static jl_array_t *inference_entrance_backtraces JL_GLOBALLY_ROOTED /*FIXME*/ = NULL;
+// Mutex for inference_entrance_backtraces
+jl_mutex_t inference_entrance_backtraces_mutex;
+
+// Register array of inference entrance backtraces
+JL_DLLEXPORT void jl_set_inference_entrance_backtraces(jl_value_t* _inference_entrance_backtraces)
+{
+    assert(_inference_entrance_backtraces == NULL || _inference_entrance_backtraces == jl_nothing || jl_is_array(_inference_entrance_backtraces));
+    if (_inference_entrance_backtraces == jl_nothing)
+        _inference_entrance_backtraces = NULL;
+    inference_entrance_backtraces = (jl_array_t*) _inference_entrance_backtraces;
+}
+
+JL_DLLEXPORT int jl_recording_inference_entrance_backtraces(void)
+{
+    return inference_entrance_backtraces != NULL;
+}
+
+JL_DLLEXPORT void jl_push_inference_entrance_backtraces(jl_value_t* ci_bt_pair)
+{
+    assert(inference_entrance_backtraces);
+    JL_LOCK(&inference_entrance_backtraces_mutex);
+    size_t end = jl_array_nrows(inference_entrance_backtraces);
+    jl_array_grow_end(inference_entrance_backtraces, 1);
+    jl_array_ptr_set(inference_entrance_backtraces, end, ci_bt_pair);
+    JL_UNLOCK(&inference_entrance_backtraces_mutex);
+}
+
 // compute whether a type references something internal to worklist
 // and thus could not have existed before deserialize
 // and thus does not need delayed unique-ing