From: simonpj <unknown>
Date: Tue, 9 Aug 2005 16:57:58 +0000 (+0000)
Subject: [project @ 2005-08-09 16:57:57 by simonpj]
X-Git-Tag: Initial_conversion_from_CVS_complete~257
X-Git-Url: http://git.megacz.com/?a=commitdiff_plain;h=70afe911563dcdc3e5fe4ed79fd944e6f0c64419;p=ghc-hetmet.git

[project @ 2005-08-09 16:57:57 by simonpj]
Comments
---

diff --git a/ghc/compiler/coreSyn/CoreUnfold.lhs b/ghc/compiler/coreSyn/CoreUnfold.lhs
index d840f45..a0050d5 100644
--- a/ghc/compiler/coreSyn/CoreUnfold.lhs
+++ b/ghc/compiler/coreSyn/CoreUnfold.lhs
@@ -552,6 +552,7 @@ callSiteInline dflags active_inline inline_call occ id arg_infos interesting_con
 		  where
 		    some_benefit = or arg_infos || really_interesting_cont || 
 		    		   (not is_top && (once || (n_vals_wanted > 0 && enough_args)))
+				-- [was (once && not in_lam)]
 		-- If it occurs more than once, there must be
 		-- something interesting about some argument, or the
 		-- result context, to make it worth inlining
diff --git a/ghc/compiler/simplCore/Simplify.lhs b/ghc/compiler/simplCore/Simplify.lhs
index 3ce54cf..a537e59 100644
--- a/ghc/compiler/simplCore/Simplify.lhs
+++ b/ghc/compiler/simplCore/Simplify.lhs
@@ -24,7 +24,7 @@ import SimplUtils	( mkCase, mkLam, prepareAlts,
 import Id		( Id, idType, idInfo, idArity, isDataConWorkId, 
 			  setIdUnfolding, isDeadBinder,
 			  idNewDemandInfo, setIdInfo, 
-			  setIdOccInfo, zapLamIdInfo, setOneShotLambda, 
+			  setIdOccInfo, zapLamIdInfo, setOneShotLambda
 			)
 import MkId		( eRROR_ID )
 import Literal		( mkStringLit )