Merge pull request ocaml#12742 from jmid/fix-domain-assertion

gasche · web-flow · commit ed3329fe767b · 2023-11-15T06:50:15.000+01:00
Fix assertion failure from ocaml#12712
diff --git a/Changes b/Changes
@@ -475,6 +475,9 @@ Working version
 
 ### Bug fixes:
 
+- #12712, #12742: fix an assertion boundary case in `caml_reset_young_limit`
+  (Jan Midtgaard, review by Guillaume Munch-Maccagnoni)
+
 - #10652, #12720: fix evaluation order in presence of optional arguments
   (Jacques Garrigue, report by Leo White, review by Vincent Laviron)
 
diff --git a/runtime/domain.c b/runtime/domain.c
@@ -1618,7 +1618,7 @@ void caml_interrupt_all_signal_safe(void)
    races. */
 void caml_reset_young_limit(caml_domain_state * dom_st)
 {
-  CAMLassert ((uintnat)dom_st->young_ptr > (uintnat)dom_st->young_trigger);
+  CAMLassert ((uintnat)dom_st->young_ptr >= (uintnat)dom_st->young_trigger);
   /* An interrupt might have been queued in the meanwhile; the
      atomic_exchange achieves the proper synchronisation with the
      reads that follow (an atomic_store is not enough). */

Original file line number	Diff line number	Diff line change
`@@ -1618,7 +1618,7 @@ void caml_interrupt_all_signal_safe(void)`
`1618`	`1618`	`races. */`
`1619`	`1619`	`void caml_reset_young_limit(caml_domain_state * dom_st)`
`1620`	`1620`	`{`
`1621`		`- CAMLassert ((uintnat)dom_st->young_ptr > (uintnat)dom_st->young_trigger);`
	`1621`	`+ CAMLassert ((uintnat)dom_st->young_ptr >= (uintnat)dom_st->young_trigger);`
`1622`	`1622`	`/* An interrupt might have been queued in the meanwhile; the`
`1623`	`1623`	`atomic_exchange achieves the proper synchronisation with the`
`1624`	`1624`	`reads that follow (an atomic_store is not enough). */`