From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 2 Dec 2010 16:08:38 +0000 (+0000)
Subject: removeThreadFromQueue: stub out the link field before returning (#4813)
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=3d7ffacd15ac7f44393a2b0186972c8903a1b643

removeThreadFromQueue: stub out the link field before returning (#4813)
---

diff --git a/rts/Threads.c b/rts/Threads.c
index 0dee734..f6b1bac 100644
--- a/rts/Threads.c
+++ b/rts/Threads.c
@@ -163,9 +163,11 @@ removeThreadFromQueue (Capability *cap, StgTSO **queue, StgTSO *tso)
 	if (t == tso) {
 	    if (prev) {
 		setTSOLink(cap,prev,t->_link);
+                t->_link = END_TSO_QUEUE;
                 return rtsFalse;
 	    } else {
 		*queue = t->_link;
+                t->_link = END_TSO_QUEUE;
                 return rtsTrue;
 	    }
 	}
@@ -190,7 +192,8 @@ removeThreadFromDeQueue (Capability *cap,
 		*head = t->_link;
                 flag = rtsTrue;
 	    }
-	    if (*tail == tso) {
+            t->_link = END_TSO_QUEUE;
+            if (*tail == tso) {
 		if (prev) {
 		    *tail = prev;
 		} else {