diff options
Diffstat (limited to 'compiler')
| -rw-r--r-- | compiler/codeGen/StgCmmEnv.hs | 6 | ||||
| -rw-r--r-- | compiler/codeGen/StgCmmMonad.hs | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs index 25bbe8f63f..587601f226 100644 --- a/compiler/codeGen/StgCmmEnv.hs +++ b/compiler/codeGen/StgCmmEnv.hs @@ -70,13 +70,13 @@ nonVoidIds ids = [NonVoid id | id <- ids, not (isVoidRep (idPrimRep id))] mkCgIdInfo :: Id -> LambdaFormInfo -> CmmExpr -> CgIdInfo mkCgIdInfo id lf expr - = CgIdInfo { cg_id = id, cg_rep = idPrimRep id, cg_lf = lf + = CgIdInfo { cg_id = id, cg_lf = lf , cg_loc = CmmLoc expr, cg_tag = lfDynTag lf } litIdInfo :: Id -> LambdaFormInfo -> CmmLit -> CgIdInfo litIdInfo id lf lit - = CgIdInfo { cg_id = id, cg_rep = idPrimRep id, cg_lf = lf + = CgIdInfo { cg_id = id, cg_lf = lf , cg_loc = CmmLoc (addDynTag (CmmLit lit) tag) , cg_tag = tag } where @@ -84,7 +84,7 @@ litIdInfo id lf lit lneIdInfo :: Id -> [LocalReg] -> CgIdInfo lneIdInfo id regs - = CgIdInfo { cg_id = id, cg_rep = idPrimRep id, cg_lf = lf + = CgIdInfo { cg_id = id, cg_lf = lf , cg_loc = LneLoc blk_id regs , cg_tag = lfDynTag lf } where diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs index 55dd45b0ec..7ea2183ef2 100644 --- a/compiler/codeGen/StgCmmMonad.hs +++ b/compiler/codeGen/StgCmmMonad.hs @@ -55,7 +55,6 @@ import DynFlags import MkGraph import BlockId import CLabel -import TyCon ( PrimRep ) import SMRep import Module import Id @@ -178,7 +177,6 @@ data CgIdInfo -- virtue of being externalised, for splittable C , cg_lf :: LambdaFormInfo , cg_loc :: CgLoc -- CmmExpr for the *tagged* value - , cg_rep :: PrimRep -- Cache for (idPrimRep id) , cg_tag :: {-# UNPACK #-} !DynTag -- Cache for (lfDynTag cg_lf) } |