From: Simon Marlow <marlowsd@gmail.com>
Date: Thu, 10 Jul 2008 11:52:21 +0000 (+0000)
Subject: oops, fix more register clobberage
X-Git-Tag: Before_cabalised-GHC~45
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=a5b95b1f569d05b2a04583ff6042add3efaaefc3;p=ghc-hetmet.git

oops, fix more register clobberage
fixes crash with -threaded -debug for me
---

diff --git a/rts/PrimOps.cmm b/rts/PrimOps.cmm
index e8b216f..54c165c 100644
--- a/rts/PrimOps.cmm
+++ b/rts/PrimOps.cmm
@@ -1740,7 +1740,7 @@ putMVarzh_fast
 
 	/* actually perform the takeMVar */
 	tso = StgMVar_head(mvar);
-	PerformTake(tso, R2);
+	PerformTake(tso, val);
         if (TO_W_(StgTSO_flags(tso)) & TSO_DIRTY == 0) {
             foreign "C" dirty_TSO(MyCapability() "ptr", tso "ptr") [];
         }
@@ -1763,7 +1763,7 @@ putMVarzh_fast
     else
     {
 	/* No further takes, the MVar is now full. */
-	StgMVar_value(mvar) = R2;
+	StgMVar_value(mvar) = val;
 
 #if defined(THREADED_RTS)
     	unlockClosure(mvar, stg_MVAR_DIRTY_info);