X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fwin32%2FAsyncIO.c;h=ff2e1a24980167e3b79a3fd6107d3a28d8ced81b;hb=890f22ef8eff8dbb5b31fa221dfce65a7b84c202;hp=8662e2a3690cc96a4545e9777577634431cf611e;hpb=653e325e08c5f632aa194f9239e938faca5abba5;p=ghc-hetmet.git

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 8662e2a..ff2e1a2 100644
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -276,20 +276,7 @@ start:
 	    prev = NULL;
 	    for(tso = blocked_queue_hd ; tso != END_TSO_QUEUE; tso = tso->_link) {
 	
-                if (tso->what_next == ThreadRelocated) {
-                    /* Drop the TSO from blocked_queue */
-                    if (prev) {
-                        setTSOLink(&MainCapability, prev, tso->_link);
-                    } else {
-                        blocked_queue_hd = tso->_link;
-                    }
-                    if (blocked_queue_tl == tso) {
-                        blocked_queue_tl = prev ? prev : END_TSO_QUEUE;
-                    }
-                    continue;
-                }
-
-		switch(tso->why_blocked) {
+                switch(tso->why_blocked) {
 		case BlockedOnRead:
 		case BlockedOnWrite:
 		case BlockedOnDoProc:
@@ -313,6 +300,11 @@ start:
 			/* Terminates the run queue + this inner for-loop. */
 			tso->_link = END_TSO_QUEUE;
 			tso->why_blocked = NotBlocked;
+                        // save the StgAsyncIOResult in the
+                        // stg_block_async_info stack frame, because
+                        // the block_info field will be overwritten by
+                        // pushOnRunQueue().
+                        tso->sp[1] = (W_)tso->block_info.async_result;
 			pushOnRunQueue(&MainCapability, tso);
 			break;
 		    }