fix work accounting in marking phase (ocaml#10449)

gerdstolpmann · Jun 15, 2021 · dfc9f19 · dfc9f19
1 parent aa890e2
commit dfc9f19
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/Changes b/Changes
@@ -585,6 +585,9 @@ OCaml 4.13.0
 - #10376: Link runtime libraries correctly on msvc64 in -output-complete-obj
   (David Allsopp, review by Gabriel Scherer)
 
+- #xxx: Fix major GC work accounting (the GC was running too fast).
+  (Damien Doligez, report by Stephen Dolan, review by xxx)
+
 OCaml 4.12.0 (24 February 2021)
 -------------------------------
 

diff --git a/runtime/major_gc.c b/runtime/major_gc.c
@@ -463,7 +463,7 @@ Caml_inline void mark_slice_darken(struct mark_stack* stk, value v, mlsize_t i,
       if( Tag_hd(chd) < No_scan_tag ) {
         mark_stack_push(stk, child, 0, work);
       } else {
-        *work -= 1; /* Account for header */
+        *work -= Whsize_hd (chd);
       }
     }
   }