From: simonpj@microsoft.com <unknown>
Date: Mon, 5 Nov 2007 22:06:27 +0000 (+0000)
Subject: Wibble to earlier case-merge fix
X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=7c1e4f1a903bb6443caa22270a7d8c377baaa20a

Wibble to earlier case-merge fix

This fix avoids a bogus WARN in SimplEnv.substId
---

diff --git a/compiler/simplCore/SimplEnv.lhs b/compiler/simplCore/SimplEnv.lhs
index d0240fb..294651a 100644
--- a/compiler/simplCore/SimplEnv.lhs
+++ b/compiler/simplCore/SimplEnv.lhs
@@ -455,7 +455,7 @@ 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) 
@@ -464,7 +464,9 @@ substId (SimplEnv { seInScope = in_scope, seIdSubst = ids }) v
   = case lookupVarEnv ids v of
 	Nothing		      -> DoneId (refine in_scope v)
 	Just (DoneId v)       -> DoneId (refine in_scope v)
-	Just (DoneEx (Var 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
 
@@ -475,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