From: simonmar <unknown>
Date: Thu, 25 May 2000 09:16:56 +0000 (+0000)
Subject: [project @ 2000-05-25 09:16:56 by simonmar]
X-Git-Tag: Approximately_9120_patches~4378
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=b537743d6e51e7f5f8da13b1c7e90b60844018a6;p=ghc-hetmet.git

[project @ 2000-05-25 09:16:56 by simonmar]
raise_info, the info table we use for overwriting thunks with an
exception, had the bogus closure type of FUN.  This was mostly
harmless, but caused some confusion for THUNK_SELECTORs, which rightly
assumed that they shouldn't be pointing at FUNs.

The fix is to change the type to THUNK, which is slightly closer to
being true.

This fixes Alastair Reid's "THUNK_SELECTOR: strange selectee" bug.
---

diff --git a/ghc/rts/Exception.hc b/ghc/rts/Exception.hc
index e538967..e11304a 100644
--- a/ghc/rts/Exception.hc
+++ b/ghc/rts/Exception.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: Exception.hc,v 1.13 2000/04/26 09:44:18 simonmar Exp $
+ * $Id: Exception.hc,v 1.14 2000/05/25 09:16:56 simonmar Exp $
  *
  * (c) The GHC Team, 1998-1999
  *
@@ -329,7 +329,7 @@ FN_(catchzh_fast)
  * It is used in raisezh_fast to update thunks on the update list
  * -------------------------------------------------------------------------- */
 
-INFO_TABLE(raise_info,raise_entry,1,0,FUN,,EF_,0,0);
+INFO_TABLE(raise_info,raise_entry,1,0,THUNK,,EF_,0,0);
 STGFUN(raise_entry)
 {
   FB_