X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FcoreSyn%2FCoreTidy.lhs;h=ff68b129f0c9d46924b54aa53c278156de0d3b19;hb=703ca1542c8e0983cc9d8eebce6e9f3dd3fd71e2;hp=3f8402131a47ae74cb1fa9984354960eda8a78a4;hpb=30c122df62ec75f9ed7f392f24c2925675bf1d06;p=ghc-hetmet.git

diff --git a/compiler/coreSyn/CoreTidy.lhs b/compiler/coreSyn/CoreTidy.lhs
index 3f84021..ff68b12 100644
--- a/compiler/coreSyn/CoreTidy.lhs
+++ b/compiler/coreSyn/CoreTidy.lhs
@@ -14,7 +14,7 @@ module CoreTidy (
 #include "HsVersions.h"
 
 import CoreSyn
-import CoreUtils
+import CoreArity
 import Id
 import IdInfo
 import Type
@@ -22,7 +22,6 @@ import Var
 import VarEnv
 import UniqFM
 import Name hiding (tidyNameOcc)
-import OccName
 import SrcLoc
 import Maybes
 
@@ -176,15 +175,21 @@ tidyIdBndr env@(tidy_env, var_env) id
 	-- though we could extract it from the Id
 	-- 
 	-- All nested Ids now have the same IdInfo, namely vanillaIdInfo,
-	-- which should save some space.
+	-- which should save some space; except that we hang onto dead-ness
+	-- (at the moment, solely to make printing tidy core nicer)
 	-- But note that tidyLetBndr puts some of it back.
-        ty'          	  = tidyType env (idType id)
-	id'          	  = mkUserLocal occ' (idUnique id) ty' noSrcSpan
-				`setIdInfo` vanillaIdInfo
-	var_env'	  = extendVarEnv var_env id id'
+        ty'      = tidyType env (idType id)
+        name'    = mkInternalName (idUnique id) occ' noSrcSpan
+	id'      = mkLocalIdWithInfo name' ty' new_info
+	var_env' = extendVarEnv var_env id id'
+        new_info | isDeadOcc (idOccInfo id) = deadIdInfo
+	         | otherwise 	            = vanillaIdInfo
     in
      ((tidy_env', var_env'), id')
    }
+
+deadIdInfo :: IdInfo
+deadIdInfo = vanillaIdInfo `setOccInfo` IAmDead
 \end{code}
 
 \begin{code}