Merge pull request ocaml-multicore/ocaml-multicore#511 from sadiqj/fi…

…x_unique_token_root Allocate unique root token on the major heap instead of the minor
gretay-js · Mar 26, 2021 · a3ea5f2 · a3ea5f2
2 parents dad476e + 0913c23
commit a3ea5f2
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/runtime/domain.c b/runtime/domain.c
@@ -281,7 +281,11 @@ static void create_domain(uintnat initial_minor_heap_wsize) {
       goto create_dls_root_failure;
     }
 
-    domain_state->unique_token_root = caml_alloc_1(Abstract_tag, Val_unit);
+    domain_state->unique_token_root = caml_alloc_shr_noexc(Abstract_tag, Val_unit);
+    if(domain_state->unique_token_root == (value)NULL) {
+      goto create_unique_token_failure;
+    }
+
     caml_register_generational_global_root(&domain_state->unique_token_root);
 
     domain_state->stack_cache = caml_alloc_stack_cache();
@@ -318,6 +322,7 @@ static void create_domain(uintnat initial_minor_heap_wsize) {
 create_stack_cache_failure:
   caml_remove_generational_global_root(&domain_state->unique_token_root);
   caml_delete_root(domain_state->dls_root);
+create_unique_token_failure:
 create_dls_root_failure:
 reallocate_minor_heap_failure:
   caml_teardown_major_gc();