X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fwin32%2FAsyncIO.c;h=979df0cb272f649829144ef9759b6bbecda15142;hb=58532eb46041aec8d4cbb48b054cb5b001edb43c;hp=1b57d37d342a08e44bbb3441549ff15ef9795606;hpb=b877faddc0cce7cceb470861a084784e0c1073b0;p=ghc-hetmet.git

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 1b57d37..979df0c 100644
--- a/rts/win32/AsyncIO.c
+++ b/rts/win32/AsyncIO.c
@@ -12,7 +12,6 @@
 #include <windows.h>
 #include <stdio.h>
 #include "Schedule.h"
-#include "RtsFlags.h"
 #include "Capability.h"
 #include "win32/AsyncIO.h"
 #include "win32/IOManager.h"
@@ -277,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:
@@ -314,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->stackobj->sp[1] = (W_)tso->block_info.async_result;
 			pushOnRunQueue(&MainCapability, tso);
 			break;
 		    }