X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Frts%2FException.cmm;h=9d8d9d69544c040263a2348e454eeb2dd0ef1941;hb=ce9d03fa27ce85072d8ac1426d5420a5c0c215ee;hp=dc6305cef0e1d7874f52a0d194abef47bc9ee39b;hpb=c1fa1f507a3cad662618941102ebc6fb87df4dbd;p=ghc-hetmet.git

diff --git a/ghc/rts/Exception.cmm b/ghc/rts/Exception.cmm
index dc6305c..9d8d9d6 100644
--- a/ghc/rts/Exception.cmm
+++ b/ghc/rts/Exception.cmm
@@ -378,10 +378,15 @@ retry_pop_stack:
     }
 
     if (frame_type == STOP_FRAME) {
-	/* We've stripped the entire stack, the thread is now dead. */
-	Sp = CurrentTSO + OFFSET_StgTSO_stack 
-		+ WDS(StgTSO_stack_size(CurrentTSO)) - WDS(1);
-	Sp(0) = R1;		/* save the exception */
+	/*
+	 * We've stripped the entire stack, the thread is now dead.
+	 * We will leave the stack in a GC'able state, see the stg_stop_thread
+	 * entry code in StgStartup.cmm.
+	 */
+	Sp = CurrentTSO + TSO_OFFSET_StgTSO_stack 
+		+ WDS(StgTSO_stack_size(CurrentTSO)) - WDS(2);
+	Sp(1) = R1;		/* save the exception */
+	Sp(0) = stg_enter_info; /* so that GC can traverse this stack */
 	StgTSO_what_next(CurrentTSO) = ThreadKilled::I16;
 	SAVE_THREAD_STATE();	/* inline! */