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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/6a6b16df28a0a38ac93a51767fcd743d04097ac5

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

commit 6a6b16df28a0a38ac93a51767fcd743d04097ac5
Author: Simon Marlow <[email protected]>
Date:   Wed Apr 13 11:27:20 2011 +0100

    fix a bug introduced in 1fb38442d3a55ac92795aa6c5ed4df82011df724,
    symptom was 2047(threaded2) was crashing.

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

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

diff --git a/rts/sm/GC.c b/rts/sm/GC.c
index d0dd44d..05bc8f2 100644
--- a/rts/sm/GC.c
+++ b/rts/sm/GC.c
@@ -643,8 +643,12 @@ GarbageCollect (rtsBool force_major_gc,
   // zero the scavenged static object list 
   if (major_gc) {
       nat i;
-      for (i = 0; i < n_gc_threads; i++) {
-          zero_static_object_list(gc_threads[i]->scavenged_static_objects);
+      if (n_gc_threads == 1) {
+          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);
+          }
       }
   }
 



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

Reply via email to