[commit: ghc] master: Fix for a bug in +RTS -qi (crash in zero_static_object_list) (011d6f9)

Simon Marlow marlowsd at gmail.com
Tue Dec 13 16:02:59 CET 2011


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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/011d6f96b6bbaf1aa651c96ccbee0d21d16c2146

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

commit 011d6f96b6bbaf1aa651c96ccbee0d21d16c2146
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Tue Dec 13 13:03:23 2011 +0000

    Fix for a bug in +RTS -qi (crash in zero_static_object_list)

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

 rts/sm/GC.c |    4 +++-
 1 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index 993de51..aeadf6f 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -651,7 +651,9 @@ GarbageCollect (rtsBool force_major_gc,
           zero_static_object_list(gct->scavenged_static_objects);
       } else {
           for (i = 0; i < n_gc_threads; i++) {
-              zero_static_object_list(gc_threads[i]->scavenged_static_objects);
+              if (!gc_threads[i]->idle) {
+                  zero_static_object_list(gc_threads[i]->scavenged_static_objects);
+              }
           }
       }
   }





More information about the Cvs-ghc mailing list