X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fsm%2FMarkWeak.c;h=f4b576ac735bed0b1f12a3b1ea70fc08473cc963;hb=2c3412138019d6b42a9974f7d8c7853c86ec96d5;hp=aadd5757af4dceb15048cad375ac82bd6cfd727b;hpb=539d3adec64f51a3fb13bb65b7a494d7eded01a0;p=ghc-hetmet.git

diff --git a/rts/sm/MarkWeak.c b/rts/sm/MarkWeak.c
index aadd575..f4b576a 100644
--- a/rts/sm/MarkWeak.c
+++ b/rts/sm/MarkWeak.c
@@ -110,7 +110,7 @@ traverseWeakPtrList(void)
       /* doesn't matter where we evacuate values/finalizers to, since
        * these pointers are treated as roots (iff the keys are alive).
        */
-      gct->evac_gen = 0;
+      gct->evac_gen_no = 0;
       
       last_w = &old_weak_ptr_list;
       for (w = old_weak_ptr_list; w != NULL; w = next_w) {
@@ -260,12 +260,6 @@ static rtsBool tidyThreadList (generation *gen)
         }
         
         ASSERT(get_itbl(t)->type == TSO);
-        if (t->what_next == ThreadRelocated) {
-            next = t->_link;
-            *prev = next;
-            continue;
-        }
-        
         next = t->global_link;
         
         // if the thread is not masking exceptions but there are