From: simonmar <unknown>
Date: Tue, 8 Nov 2005 10:44:22 +0000 (+0000)
Subject: [project @ 2005-11-08 10:44:22 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~62
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=6e4e6a2a03482cb1a04e128136ea431236507342;p=ghc-hetmet.git

[project @ 2005-11-08 10:44:22 by simonmar]
raiseAsync: fix bug that can cause a scavenge_stack panic for a thread
that has just been killed.
---

diff --git a/ghc/rts/Schedule.c b/ghc/rts/Schedule.c
index 93a64d8..35e87e0 100644
--- a/ghc/rts/Schedule.c
+++ b/ghc/rts/Schedule.c
@@ -3802,9 +3802,8 @@ raiseAsync_(Capability *cap, StgTSO *tso, StgClosure *exception,
 	
 	case STOP_FRAME:
 	    // We've stripped the entire stack, the thread is now dead.
-	    sp += sizeofW(StgStopFrame);
 	    tso->what_next = ThreadKilled;
-	    tso->sp = sp;
+	    tso->sp = frame + sizeofW(StgStopFrame);
 	    return;
 	    
 	default: