X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplify.lhs;h=3f3245935084eb61c3f8275f1a2dd30302525acd;hb=30c39066cfbbb9380fff1f3266405d37af798009;hp=dbad116eae6fe733140a182e89ed83e0d9c4e687;hpb=58e45ee86bbda3f24a4caf41c0aea7a6b787367e;p=ghc-hetmet.git

diff --git a/compiler/simplCore/Simplify.lhs b/compiler/simplCore/Simplify.lhs
index dbad116..3f32459 100644
--- a/compiler/simplCore/Simplify.lhs
+++ b/compiler/simplCore/Simplify.lhs
@@ -264,7 +264,7 @@ simplRecBind env top_lvl pairs
   where
     add_rules :: SimplEnv -> (InBndr,InExpr) -> (SimplEnv, (InBndr, OutBndr, InExpr))
 	-- Add the (substituted) rules to the binder
-    add_rules env (bndr, rhs) = (env, (bndr, bndr', rhs))
+    add_rules env (bndr, rhs) = (env', (bndr, bndr', rhs))
 	where
 	  (env', bndr') = addBndrRules env bndr (lookupRecBndr env bndr)
 
@@ -1027,12 +1027,10 @@ completeCall env var cont
 	------------- Next try inlining ----------------
 	{ let	arg_infos = [interestingArg arg | arg <- args, isValArg arg]
 		n_val_args = length arg_infos
-	      	interesting_cont = interestingCallContext (notNull args)
-						  	  (notNull arg_infos)
-						  	  call_cont
+	      	interesting_cont = interestingCallContext call_cont
 	 	active_inline = activeInline env var
-		maybe_inline  = callSiteInline dflags active_inline
-				       var arg_infos interesting_cont
+		maybe_inline  = callSiteInline dflags active_inline var
+				               (null args) arg_infos interesting_cont
 	; case maybe_inline of {
 	    Just unfolding  	-- There is an inlining!
 	      ->  do { tick (UnfoldingDone var)