Further fixes to gc_ctrl.c

gadmm · gadmm · commit fe14eb8a0221 · 2022-02-25T16:13:27.000+01:00
Fixes test `tests/weak-ephe-final/finaliser2.ml`.
diff --git a/runtime/gc_ctrl.c b/runtime/gc_ctrl.c
@@ -212,18 +212,18 @@ CAMLprim value caml_gc_minor(value v)
   CAML_EV_BEGIN(EV_EXPLICIT_GC_MINOR);
   CAMLassert (v == Val_unit);
   caml_minor_collection ();
+  value exn = caml_process_pending_actions_exn();
   CAML_EV_END(EV_EXPLICIT_GC_MINOR);
-  return Val_unit;
+  return caml_raise_if_exception(exn);
 }
 
 static value gc_major_exn(void)
 {
-  value exn = Val_unit;
   CAML_EV_BEGIN(EV_EXPLICIT_GC_MAJOR);
   caml_gc_log ("Major GC cycle requested");
   caml_empty_minor_heaps_once();
   caml_finish_major_cycle();
-  exn = caml_process_pending_actions_exn();
+  value exn = caml_process_pending_actions_exn();
   CAML_EV_END(EV_EXPLICIT_GC_MAJOR);
   return exn;
 }
@@ -245,7 +245,7 @@ static value gc_full_major_exn(void)
   for (i = 0; i < 3; i++) {
     caml_empty_minor_heaps_once();
     caml_finish_major_cycle();
-    exn = caml_process_pending_actions_exn ();
+    exn = caml_process_pending_actions_exn();
     if (Is_exception_result(exn)) break;
   }
   ++ Caml_state->stat_forced_major_collections;
@@ -264,8 +264,9 @@ CAMLprim value caml_gc_major_slice (value v)
   CAML_EV_BEGIN(EV_EXPLICIT_GC_MAJOR_SLICE);
   CAMLassert (Is_long (v));
   caml_major_collection_slice(Long_val(v));
+  value exn = caml_process_pending_actions_exn();
   CAML_EV_END(EV_EXPLICIT_GC_MAJOR_SLICE);
-  return Val_long (0);
+  return caml_raise_if_exception(exn);
 }
 
 CAMLprim value caml_gc_compaction(value v)
