From: simonmar <unknown>
Date: Fri, 7 Jan 2005 13:06:20 +0000 (+0000)
Subject: [project @ 2005-01-07 13:06:20 by simonmar]
X-Git-Tag: Initial_conversion_from_CVS_complete~1282
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2fe2881b710e6ec1bea2ba71c202c85d76127663;p=ghc-hetmet.git

[project @ 2005-01-07 13:06:20 by simonmar]
Fix what looks like a cut-n-pasto in retry#: the MAYBE_GC() was
specifying readTVarzh_fast as the restart point, leading to a crash if
MAYBE_GC triggered a GC in here.
---

diff --git a/ghc/rts/PrimOps.cmm b/ghc/rts/PrimOps.cmm
index c2f8373..26b3ce6 100644
--- a/ghc/rts/PrimOps.cmm
+++ b/ghc/rts/PrimOps.cmm
@@ -1212,7 +1212,7 @@ retryzh_fast
   W_ outer;
   W_ r;
 
-  MAYBE_GC (NO_PTRS, readTVarzh_fast); // STM operations may allocate
+  MAYBE_GC (NO_PTRS, retryzh_fast); // STM operations may allocate
 
   // Find the enclosing ATOMICALLY_FRAME or CATCH_RETRY_FRAME
 retry_pop_stack: