From bcea125324625d548f4705c29a9d9c57b7a9dc13 Mon Sep 17 00:00:00 2001
From: simonmar <unknown>
Date: Tue, 17 Sep 2002 12:32:40 +0000
Subject: [PATCH] [project @ 2002-09-17 12:32:40 by simonmar]
 NON_ENTERABLE_ENTRY_CODE() should really barf() rather than
 attempting a clean shutdown.

MERGE TO STABLE
---
 ghc/rts/StgMiscClosures.hc |   19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/ghc/rts/StgMiscClosures.hc b/ghc/rts/StgMiscClosures.hc
index 38f66c6..7dcae9f 100644
--- a/ghc/rts/StgMiscClosures.hc
+++ b/ghc/rts/StgMiscClosures.hc
@@ -1,5 +1,5 @@
 /* -----------------------------------------------------------------------------
- * $Id: StgMiscClosures.hc,v 1.77 2002/07/18 06:05:30 sof Exp $
+ * $Id: StgMiscClosures.hc,v 1.78 2002/09/17 12:32:40 simonmar Exp $
  *
  * (c) The GHC Team, 1998-2000
  *
@@ -36,14 +36,13 @@
   Template for the entry code of non-enterable closures.
 */
 
-#define NON_ENTERABLE_ENTRY_CODE(type)					\
-STGFUN(stg_##type##_entry)							\
-{									\
-  FB_									\
-    DUMP_ERRMSG(#type " object entered!\n");                            \
-    STGCALL1(shutdownHaskellAndExit, EXIT_FAILURE);			\
-    return NULL;							\
-  FE_									\
+#define NON_ENTERABLE_ENTRY_CODE(type)		\
+STGFUN(stg_##type##_entry)			\
+{						\
+  FB_						\
+    barf(#type " object entered!\n");		\
+    return NULL;				\
+  FE_						\
 }
 
 
@@ -629,7 +628,7 @@ STGFUN(stg_SE_BLACKHOLE_entry)
   FE_
 }
 
-INFO_TABLE(SE_CAF_BLACKHOLE_info, SE_CAF_BLACKHOLE_entry,0,2,SE_CAF_BLACKHOLE,,EF_,"CAF_BLACKHOLE","CAF_BLACKHOLE");
+INFO_TABLE(stg_SE_CAF_BLACKHOLE_info, SE_CAF_BLACKHOLE_entry,0,2,SE_CAF_BLACKHOLE,,EF_,"CAF_BLACKHOLE","CAF_BLACKHOLE");
 STGFUN(stg_SE_CAF_BLACKHOLE_entry)
 {
   FB_
-- 
1.7.10.4