Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/3457c6befa697e52dd71f7efa1940f010f792469

>---------------------------------------------------------------

commit 3457c6befa697e52dd71f7efa1940f010f792469
Author: Ian Lynagh <[email protected]>
Date:   Tue May 1 00:25:55 2012 +0100

    Fix maintenance of n_blocks in the RTS
    
    It was causing assertion failures of
        ASSERT(countBlocks(nursery->blocks) == nursery->n_blocks)
    at
        ghc-stage2: internal error: ASSERTION FAILED: file rts/sm/Sanity.c, 
line 878

>---------------------------------------------------------------

 rts/sm/Storage.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/rts/sm/Storage.c b/rts/sm/Storage.c
index 7da0c70..17798a2 100644
--- a/rts/sm/Storage.c
+++ b/rts/sm/Storage.c
@@ -796,7 +796,7 @@ allocatePinned (Capability *cap, lnat n)
             if (bd->link != NULL) {
                 bd->link->u.back = cap->r.rCurrentNursery;
             }
-            cap->r.rNursery->n_blocks--;
+            cap->r.rNursery->n_blocks -= bd->blocks;
         }
 
         cap->pinned_object_block = bd;



_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to