X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FsimplCore%2FSimplEnv.lhs;h=762758fadf308a8b48260dbebbddc94e96ec3f78;hb=81de68e651377e8f31c83b1919a64a17a6567233;hp=1b057379b4cd8d063e3093cc896ff73ab0a97375;hpb=be7bf80fec1f471ceccbbe06885c265411baf25e;p=ghc-hetmet.git

diff --git a/compiler/simplCore/SimplEnv.lhs b/compiler/simplCore/SimplEnv.lhs
index 1b05737..762758f 100644
--- a/compiler/simplCore/SimplEnv.lhs
+++ b/compiler/simplCore/SimplEnv.lhs
@@ -455,15 +455,19 @@ floatBinds (Floats bs _) = fromOL bs
 
 
 \begin{code}
-substId :: SimplEnv -> Id -> SimplSR
+substId :: SimplEnv -> InId -> SimplSR
+-- Returns DoneEx only on a non-Var expression
 substId (SimplEnv { seInScope = in_scope, seIdSubst = ids }) v 
   | not (isLocalId v) 
   = DoneId v
   | otherwise	-- A local Id
   = case lookupVarEnv ids v of
-	Just (DoneId v) -> DoneId (refine in_scope v)
-	Just res	-> res
-	Nothing		-> DoneId (refine in_scope v)
+	Nothing		      -> DoneId (refine in_scope v)
+	Just (DoneId v)       -> DoneId (refine in_scope v)
+	Just (DoneEx (Var v)) 
+	       | isLocalId v  -> DoneId (refine in_scope v)
+	       | otherwise    -> DoneId v
+	Just res	      -> res	-- DoneEx non-var, or ContEx
   where
 
 	-- Get the most up-to-date thing from the in-scope set
@@ -473,7 +477,7 @@ refine in_scope v = case lookupInScope in_scope v of
 			 Just v' -> v'
 			 Nothing -> WARN( True, ppr v ) v	-- This is an error!
 
-lookupRecBndr :: SimplEnv -> Id -> Id
+lookupRecBndr :: SimplEnv -> InId -> OutId
 -- Look up an Id which has been put into the envt by simplRecBndrs,
 -- but where we have not yet done its RHS
 lookupRecBndr (SimplEnv { seInScope = in_scope, seIdSubst = ids }) v
@@ -617,7 +621,7 @@ Can we eta-expand f?  Only if we see that f has arity 1, and then we
 take advantage of the 'state hack' on the result of
 (f y) :: State# -> (State#, Int) to expand the arity one more.
 
-There is a disadvantage though.  Making the arity visible in the RHA
+There is a disadvantage though.  Making the arity visible in the RHS
 allows us to eta-reduce
 	f = \x -> f x
 to
@@ -655,7 +659,7 @@ addBndrRules env in_id out_id
   where
     subst     = mkCoreSubst env
     old_rules = idSpecialisation in_id
-    new_rules = CoreSubst.substSpec subst old_rules
+    new_rules = CoreSubst.substSpec subst out_id old_rules
     final_id  = out_id `setIdSpecialisation` new_rules
 
 ------------------