Add assertions for caml_ephe_ref_table in minor_gc

bobot · bobot · commit b47106737959 · 2016-03-02T23:26:25.000+01:00
diff --git a/byterun/caml/minor_gc.h b/byterun/caml/minor_gc.h
@@ -87,6 +87,7 @@ static inline void add_to_ephe_ref_table (struct caml_ephe_ref_table *tbl,
   ephe_ref = tbl->ptr++;
   ephe_ref->ephe = ar;
   ephe_ref->offset = offset;
+  Assert(ephe_ref->offset < Wosize_val(ephe_ref->ephe));
 }
 
 #endif /* CAML_MINOR_GC_H */
diff --git a/byterun/minor_gc.c b/byterun/minor_gc.c
@@ -280,7 +280,7 @@ void caml_oldify_one (value v, value *p)
 static inline int ephe_check_alive_data(struct caml_ephe_ref_elt *re){
   mlsize_t i;
   value child;
-  for (i = 2; i < Wosize_val(re->ephe); i++){
+  for (i = CAML_EPHE_FIRST_KEY; i < Wosize_val(re->ephe); i++){
     child = Field (re->ephe, i);
     if(child != caml_ephe_none
        && Is_block (child) && Is_young (child)
@@ -371,6 +371,7 @@ void caml_empty_minor_heap (void)
     /* Update the ephemerons */
     for (re = caml_ephe_ref_table.base;
          re < caml_ephe_ref_table.ptr; re++){
+      Assert(re->offset < Wosize_val(re->ephe));
       value *key = &Field(re->ephe,re->offset);
       if (*key != caml_ephe_none && Is_block (*key) && Is_young (*key)){
         if (Hd_val (*key) == 0){ /* Value copied to major heap */

Original file line number	Diff line number	Diff line change
`@@ -87,6 +87,7 @@ static inline void add_to_ephe_ref_table (struct caml_ephe_ref_table *tbl,`
`87`	`87`	`ephe_ref = tbl->ptr++;`
`88`	`88`	`ephe_ref->ephe = ar;`
`89`	`89`	`ephe_ref->offset = offset;`
	`90`	`+ Assert(ephe_ref->offset < Wosize_val(ephe_ref->ephe));`
`90`	`91`	`}`
`91`	`92`
`92`	`93`	`#endif /* CAML_MINOR_GC_H */`