X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=rts%2FGC.c;h=66bb5dc487d146377f557ccb157e775d6265c21c;hp=727027dd930d2f937be8bad7e84d56816bb29883;hb=a0be7e7ccd602efd9b7d35b3e0747a2c4f155ce9;hpb=5a2769f0273dd389977e8283375e7920d183bdd4

diff --git a/rts/GC.c b/rts/GC.c
index 727027d..66bb5dc 100644
--- a/rts/GC.c
+++ b/rts/GC.c
@@ -44,6 +44,7 @@
 #endif
 #include "Trace.h"
 #include "RetainerProfile.h"
+#include "RaiseAsync.h"
 
 #include <string.h>
 
@@ -826,8 +827,8 @@ GarbageCollect ( void (*get_roots)(evac_fn), rtsBool force_major_gc )
 	copied +=  mut_list_size;
 
 	debugTrace(DEBUG_gc,
-		   "mut_list_size: %ld (%d vars, %d arrays, %d others)",
-		   mut_list_size * sizeof(W_), 
+		   "mut_list_size: %lu (%d vars, %d arrays, %d others)",
+		   (unsigned long)(mut_list_size * sizeof(W_)),
 		   mutlist_MUTVARS, mutlist_MUTARRS, mutlist_OTHERS);
     }
 
@@ -1897,8 +1898,6 @@ loop:
 	  }
 	  return q;
 	  
-      case CONSTR_INTLIKE:
-      case CONSTR_CHARLIKE:
       case CONSTR_NOCAF_STATIC:
 	  /* no need to put these on the static linked list, they don't need
 	   * to be scavenged.
@@ -2631,10 +2630,8 @@ scavengeTSO (StgTSO *tso)
 	) {
 	tso->block_info.closure = evacuate(tso->block_info.closure);
     }
-    if ( tso->blocked_exceptions != NULL ) {
-	tso->blocked_exceptions = 
-	    (StgTSO *)evacuate((StgClosure *)tso->blocked_exceptions);
-    }
+    tso->blocked_exceptions = 
+	(StgTSO *)evacuate((StgClosure *)tso->blocked_exceptions);
     
     // We don't always chase the link field: TSOs on the blackhole
     // queue are not automatically alive, so the link field is a
@@ -4620,6 +4617,14 @@ threadPaused(Capability *cap, StgTSO *tso)
     nat weight_pending   = 0;
     rtsBool prev_was_update_frame;
     
+    // Check to see whether we have threads waiting to raise
+    // exceptions, and we're not blocking exceptions, or are blocked
+    // interruptibly.  This is important; if a thread is running with
+    // TSO_BLOCKEX and becomes blocked interruptibly, this is the only
+    // place we ensure that the blocked_exceptions get a chance.
+    maybePerformBlockedException (cap, tso);
+    if (tso->what_next == ThreadKilled) { return; }
+
     stack_end = &tso->stack[tso->stack_size];
     
     frame = (StgClosure *)tso->sp;
@@ -4643,7 +4648,7 @@ threadPaused(Capability *cap, StgTSO *tso)
 	    if (closure_IND(bh) || bh->header.info == &stg_BLACKHOLE_info) {
 		debugTrace(DEBUG_squeeze,
 			   "suspending duplicate work: %ld words of stack",
-			   (StgPtr)frame - tso->sp);
+			   (long)((StgPtr)frame - tso->sp));
 
 		// If this closure is already an indirection, then
 		// suspend the computation up to this point: