From: simonmar <unknown>
Date: Fri, 2 Mar 2001 14:26:40 +0000 (+0000)
Subject: [project @ 2001-03-02 14:26:40 by simonmar]
X-Git-Tag: Approximately_9120_patches~2484
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=5cd7cb62dcbdabac9f728208362e1a32d1b82c39;p=ghc-hetmet.git

[project @ 2001-03-02 14:26:40 by simonmar]
Another good bug: the stack check in the AP_UPD entry code was wrong.
This one is a definite source of crashes.

To be merged into the 4.08 branch.
---

diff --git a/ghc/rts/Updates.hc b/ghc/rts/Updates.hc
index 39c1c28..dac564e 100644
--- a/ghc/rts/Updates.hc
+++ b/ghc/rts/Updates.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Updates.hc,v 1.31 2000/12/04 12:31:22 simonmar Exp $
+ * $Id: Updates.hc,v 1.32 2001/03/02 14:26:40 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -430,7 +430,7 @@ STGFUN(stg_AP_UPD_entry)
   /* 
    * Check for stack overflow.
    */
-  STK_CHK(Words+sizeofW(StgUpdateFrame),stg_AP_UPD_entry,R2.p,1,);
+  STK_CHK_GEN(Words+sizeofW(StgUpdateFrame), R1_PTR, stg_AP_UPD_entry, );
 
   PUSH_UPD_FRAME(R1.p, 0);
   Sp -= sizeofW(StgUpdateFrame) + Words;