From: simonmar <unknown>
Date: Mon, 15 Jul 2002 14:49:17 +0000 (+0000)
Subject: [project @ 2002-07-15 14:49:17 by simonmar]
X-Git-Tag: Approx_11550_changesets_converted~1854
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=2e9250753dacfcf3678e00c483ddefc94c2a969d;p=ghc-hetmet.git

[project @ 2002-07-15 14:49:17 by simonmar]
Unbreak the registering of foreign exports as stable pointers, which
was brokwn in rev. 1.64.  This will eventually cause any program that
uses the same foreign export repeatedly to seg fault.  Dunno why we
don't have a test for this.

*sigh* the first bad bug in 5.04

MERGE TO STABLE
---

diff --git a/ghc/compiler/deSugar/DsForeign.lhs b/ghc/compiler/deSugar/DsForeign.lhs
index 84f5529..dd118ad 100644
--- a/ghc/compiler/deSugar/DsForeign.lhs
+++ b/ghc/compiler/deSugar/DsForeign.lhs
@@ -90,7 +90,7 @@ dsForeigns mod_name fos
     = dsFExport mod_name id (idType id) 
 		ext_nm cconv False                 `thenDs` \(h, c) ->
       warnDepr depr loc				   `thenDs` \_              ->
-      returnDs (acc_feb, acc_f, h $$ acc_h, c $$ acc_c, acc_header)
+      returnDs (id:acc_feb, acc_f, h $$ acc_h, c $$ acc_c, acc_header)
 
   warnDepr False _   = returnDs ()
   warnDepr True  loc = dsWarn (addShortWarnLocLine loc msg)