Merge pull request ocaml#12861 from mshinwell/backtrace-last-exn-modi…

…fication Properly modify Caml_state->backtrace_last_exn
Fourchaux · Feb 1, 2024 · 5f0cdb7 · 5f0cdb7
2 parents 6ce040f + 7c7936c
commit 5f0cdb7
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/otherlibs/systhreads/st_stubs.c b/otherlibs/systhreads/st_stubs.c
@@ -224,7 +224,8 @@ static void restore_runtime_state(caml_thread_t th)
   Caml_state->local_roots = th->local_roots;
   Caml_state->backtrace_pos = th->backtrace_pos;
   Caml_state->backtrace_buffer = th->backtrace_buffer;
-  Caml_state->backtrace_last_exn = th->backtrace_last_exn;
+  caml_modify_generational_global_root
+    (&Caml_state->backtrace_last_exn, th->backtrace_last_exn);
 #ifndef NATIVE_CODE
   Caml_state->trap_sp_off = th->trap_sp_off;
   Caml_state->trap_barrier_off = th->trap_barrier_off;