[Git][ghc/ghc][wip/gc/parallel-marking] Fix it

[Ben Gamari]

Ben Gamari pushed to branch wip/gc/parallel-marking at Glasgow Haskell Compiler / GHC


Commits:
71e9f4e6 by GHC GitLab CI at 2020-08-10T22:43:04+00:00
Fix it

- - - - -


1 changed file:

- rts/sm/NonMovingMark.c


Changes:

=====================================
rts/sm/NonMovingMark.c
=====================================
@@ -337,7 +337,7 @@ upd_rem_set_push(UpdRemSet *rs, MarkQueueEnt *ent)
         ACQUIRE_SM_LOCK;
         nonmovingAddUpdRemSetBlocks(rs);
         bdescr *bd = allocGroup(MARK_QUEUE_BLOCKS);
-        bd->link = markQueueBlockBdescr(rs->block);
+        bd->link = NULL;
         rs->block = (MarkQueueBlock *) bd->start;
         rs->block->head = 0;
         RELEASE_SM_LOCK;
@@ -390,10 +390,10 @@ STATIC_INLINE void push(struct MarkContext *mc, MarkQueueEnt *ent) {
         mark_queue_push(mc->in_conc_mark.queue, ent);
         break;
     case MARK_CTX_IN_MOVING_GC:
-        upd_rem_set_push(mc->in_moving_gc.rset, ent);
+        upd_rem_set_push_gc(mc->in_moving_gc.rset, ent);
         break;
     case MARK_CTX_IN_MUTATOR:
-        upd_rem_set_push_gc(mc->in_mutator.rset, ent);
+        upd_rem_set_push(mc->in_mutator.rset, ent);
         break;
     }
 }



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71e9f4e67b6a97dbc33edca22e9ad5c94b7a44b1

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/71e9f4e67b6a97dbc33edca22e9ad5c94b7a44b1
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20200810/9dab763d/attachment.html>