From: sof <unknown>
Date: Wed, 5 Dec 2001 16:29:54 +0000 (+0000)
Subject: [project @ 2001-12-05 16:29:54 by sof]
X-Git-Tag: Approximately_9120_patches~461
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=20baa4d6b55124dabf1af4213f8b53589763e26f;p=ghc-hetmet.git

[project @ 2001-12-05 16:29:54 by sof]
make it compile - i.e., use Subst.simplIdInfo in a manner
consistent with the repo contents. (wouldn't surprise me
if there's coreSyn/Subst.lhs change that hasn't been
committed yet...)
---

diff --git a/ghc/compiler/simplCore/Simplify.lhs b/ghc/compiler/simplCore/Simplify.lhs
index 8f1b22f..b912cff 100644
--- a/ghc/compiler/simplCore/Simplify.lhs
+++ b/ghc/compiler/simplCore/Simplify.lhs
@@ -299,7 +299,7 @@ simplNonRecBind env bndr rhs rhs_se cont_ty thing_inside
     let
 	-- simplLetBndr doesn't deal with the IdInfo, so we must
 	-- do so here (c.f. simplLazyBind)
-	bndr''  = bndr' `setIdInfo` simplIdInfo (getSubst env) (idInfo bndr)
+	bndr''  = simplIdInfo (getSubst env) (idInfo bndr) bndr'
 	env1	= modifyInScope env bndr'' bndr''
     in
     simplStrictArg AnRhs env1 rhs rhs_se (idType bndr') cont_ty	$ \ env rhs1 ->
@@ -447,7 +447,7 @@ simplLazyBind env top_lvl is_rec bndr bndr' rhs rhs_se
 	--
 	-- NB: does no harm for non-recursive bindings
     let
-	bndr''       	  = bndr' `setIdInfo` simplIdInfo (getSubst rhs_se) (idInfo bndr)
+	bndr''       	  = simplIdInfo (getSubst rhs_se) (idInfo bndr) bndr'
 	env1	     	  = modifyInScope env bndr'' bndr''
 	rhs_env      	  = setInScope rhs_se env1
  	is_top_level	  = isTopLevel top_lvl