fix #3910

[ghc-hetmet.git] / rts / win32 / AsyncIO.c

diff --git a/rts/win32/AsyncIO.c b/rts/win32/AsyncIO.c
index 8662e2a..ff2e1a2 100644 (file)
--- 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;
                    }