Fix GC for TRec mutable array entries.

We use the offset to determine if an entry is a pointer. With mutable arrays we have pointer entires beyond the index of the last non-pointer.
fryguybob · Aug 8, 2018 · def1e00 · def1e00
1 parent 7334221
commit def1e00
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 9 deletions.
diff --git a/rts/RetainerProfile.c b/rts/RetainerProfile.c
@@ -896,7 +896,8 @@ pop( StgClosure **c, StgClosure **cp, retainer *r )
              if (field_no == 0) {
                  *c = (StgClosure *)entry->tarray;
              } else if (field_no == 1) {
-                 if (entry->offset < entry->tarray->ptrs) {
+                 if (entry->offset < entry->tarray->ptrs ||
+                        (entry->offset >= (entry->tarray->ptrs + entry->tarray->words))) {
                      *c = NULL;
                      popOff();
                      return;

diff --git a/rts/sm/Compact.c b/rts/sm/Compact.c
@@ -552,7 +552,8 @@ update_fwd_large( bdescr *bd )
         thread_(&tc->prev_chunk);
         for (i = 0; i < tc -> next_entry_idx; i ++, e++ ) {
           thread_(&e->tarray);
-          if (e->offset < e->tarray->ptrs) {
+          if (e->offset < e->tarray->ptrs ||
+                (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
             thread(&e->expected_value.ptr);
             thread(&e->new_value.ptr);
           }
@@ -808,7 +809,8 @@ thread_obj (StgInfoTable *info, StgPtr p)
         thread_(&tc->prev_chunk);
         for (i = 0; i < tc -> next_entry_idx; i ++, e++ ) {
           thread_(&e->tarray);
-          if (e->offset < e->tarray->ptrs) {
+          if (e->offset < e->tarray->ptrs ||
+                (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
             thread(&e->expected_value.ptr);
             thread(&e->new_value.ptr);
           }

diff --git a/rts/sm/Evac.c b/rts/sm/Evac.c
@@ -631,6 +631,7 @@ evacuate(StgClosure **p)
       const StgInfoTable* i = INFO_PTR_TO_STRUCT(info);
       StgWord o = GET_MUT_CON_EXT_SIZE(itbl_to_mut_con_ext_itbl(i));
       StgInt dynSize = (StgInt)*(q->payload + o + i->layout.payload.ptrs + i->layout.payload.nptrs - 1);
+      debugTrace(DEBUG_gc,"evac MUT_CON_ARR_EXT_DIRTY %p count %d", q, dynSize);
       copy_tag(p,info,q,mut_constr_ext_sizeW_fromITBL(i)+dynSize,gen_no,tag);
       return;
   }

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
@@ -512,8 +512,8 @@ GarbageCollect (nat collect_gen,
                    mutlist_TVAR,
                    mutlist_TREC_CHUNK, mutlist_TREC_HEADER,
                    mutlist_WAKEUP_CHUNK,
-                   mutlist_OTHERS,
-                   mutlist_CONSTR);
+                   mutlist_CONSTR,
+                   mutlist_OTHERS);
     }
 
     bdescr *next, *prev;

diff --git a/rts/sm/Sanity.c b/rts/sm/Sanity.c
@@ -462,7 +462,8 @@ checkClosure( StgClosure* p )
         for (i = 0; i < tc -> next_entry_idx; i ++) {
           TArrayRecEntry* e = &tc->entries[i];
           ASSERT(LOOKS_LIKE_CLOSURE_PTR(e->tarray));
-          if (e->offset < e->tarray->ptrs) {
+          if (e->offset < e->tarray->ptrs ||
+                (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
               ASSERT(LOOKS_LIKE_CLOSURE_PTR(e->expected_value.ptr));
               ASSERT(LOOKS_LIKE_CLOSURE_PTR(e->new_value.ptr));
           }

diff --git a/rts/sm/Scav.c b/rts/sm/Scav.c
@@ -679,6 +679,7 @@ scavenge_block (bdescr *bd)
         }
         p += info->layout.payload.nptrs-1; // Size field
         end = p + *p + 1;
+        debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_CLEAN %p count %d", q, *p);
         for (p = p + 1; p < end; p++) {
             evacuate((StgClosure **)p);
         }
@@ -697,6 +698,7 @@ scavenge_block (bdescr *bd)
         }
         p += info->layout.payload.nptrs-1; // Size field
         end = p + *p + 1;
+        debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_DIRTY %p count %d", q, *p);
         for (p = p + 1; p < end; p++) {
             evacuate((StgClosure **)p);
         }
@@ -970,7 +972,8 @@ scavenge_block (bdescr *bd)
         evacuate((StgClosure **)&tc->prev_chunk);
         for (i = 0; i < tc -> next_entry_idx; i ++, e++ ) {
           evacuate((StgClosure **)&e->tarray);
-          if (e->offset < e->tarray->ptrs) {
+          if (e->offset < e->tarray->ptrs ||
+                (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
             evacuate((StgClosure **)&e->expected_value.ptr);
             evacuate((StgClosure **)&e->new_value.ptr);
           }
@@ -1277,6 +1280,7 @@ scavenge_mark_stack(void)
             }
             p += info->layout.payload.nptrs-1; // Size field
             end = p + *p + 1;
+            debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_CLEAN %p count %d", q, *p);
             for (p = p + 1; p < end; p++) {
                 evacuate((StgClosure **)p);
             }
@@ -1296,6 +1300,7 @@ scavenge_mark_stack(void)
             }
             p += info->layout.payload.nptrs-1; // Size field
             end = p + *p + 1;
+            debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_DIRTY %p count %d", q, *p);
             for (p = p + 1; p < end; p++) {
                 evacuate((StgClosure **)p);
             }
@@ -1567,7 +1572,8 @@ scavenge_mark_stack(void)
             evacuate((StgClosure **)&tc->prev_chunk);
             for (i = 0; i < tc -> next_entry_idx; i ++, e++ ) {
               evacuate((StgClosure **)&e->tarray);
-              if (e->offset < e->tarray->ptrs) {
+              if (e->offset < e->tarray->ptrs ||
+                    (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
                 evacuate((StgClosure **)&e->expected_value.ptr);
                 evacuate((StgClosure **)&e->new_value.ptr);
               }
@@ -1802,6 +1808,7 @@ scavenge_one(StgPtr p)
         }
         p += info->layout.payload.nptrs-1; // Size field
         end = p + *p + 1;
+        debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_CLEAN %p count %d", q, *p);
         for (p = p + 1; p < end; p++) {
             evacuate((StgClosure **)p);
         }
@@ -1820,6 +1827,7 @@ scavenge_one(StgPtr p)
         }
         p += info->layout.payload.nptrs-1; // Size field
         end = p + *p + 1;
+        debugTrace(DEBUG_gc,"scav MUT_CON_ARR_EXT_DIRTY %p count %d", q, *p);
         for (p = p + 1; p < end; p++) {
             evacuate((StgClosure **)p);
         }
@@ -2076,7 +2084,8 @@ scavenge_one(StgPtr p)
         evacuate((StgClosure **)&tc->prev_chunk);
         for (i = 0; i < tc -> next_entry_idx; i ++, e++ ) {
           evacuate((StgClosure **)&e->tarray);
-          if (e->offset < e->tarray->ptrs) {
+          if (e->offset < e->tarray->ptrs ||
+                (e->offset >= (e->tarray->ptrs + e->tarray->words))) {
             evacuate((StgClosure **)&e->expected_value.ptr);
             evacuate((StgClosure **)&e->new_value.ptr);
           }