Ekdohibs
/
ocaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix assertion in weak.h when data fild is an infix pointer.

master
Jacques-Henri Jourdan 2020-07-18 08:24:12 +02:00
parent 95400d7ee0
commit 6ad48f8229
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
runtime/caml/weak.h
View File

@ -201,15 +201,16 @@ Caml_inline void caml_ephe_clean_partial (value v,
child = Field (v, 1);
if(child != caml_ephe_none){
if (release_data){
Field (v, 1) = caml_ephe_none;
} else {
/* If we scanned all the keys and the data field remains filled,
then the mark phase must have marked it */
CAMLassert( !(offset_start == 2 && offset_end == Wosize_hd (Hd_val(v))
&& Is_block (child) && Is_in_heap (child)
&& Is_white_val (child)));
}
if (release_data) Field (v, 1) = caml_ephe_none;
#ifdef DEBUG
else if (offset_start == 2 && offset_end == Wosize_hd (Hd_val(v)) &&
Is_block (child) && Is_in_heap (child)) {
if (Tag_val (child) == Infix_tag) child -= Infix_offset_val (child);
/* If we scanned all the keys and the data field remains filled,
then the mark phase must have marked it */
CAMLassert( !Is_white_val (child) );
}
#endif
}
}