[commit: ghc] master: Remove cg_tag from CgIdInfo (a81317c)
Simon Peyton Jones
simonpj at microsoft.com
Sat Mar 9 17:34:56 CET 2013
Repository : http://darcs.haskell.org/ghc.git/
On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a81317c40cb0fb1be104f3e62bd06beafaf2b900
>---------------------------------------------------------------
commit a81317c40cb0fb1be104f3e62bd06beafaf2b900
Author: Boris Sukholitko <boriss at gmail.com>
Date: Sat Mar 9 11:46:52 2013 +0200
Remove cg_tag from CgIdInfo
>---------------------------------------------------------------
compiler/codeGen/StgCmmEnv.hs | 9 +++------
compiler/codeGen/StgCmmMonad.hs | 1 -
2 files changed, 3 insertions(+), 7 deletions(-)
diff --git a/compiler/codeGen/StgCmmEnv.hs b/compiler/codeGen/StgCmmEnv.hs
index 1d6f386..4b7272a 100644
--- a/compiler/codeGen/StgCmmEnv.hs
+++ b/compiler/codeGen/StgCmmEnv.hs
@@ -71,22 +71,19 @@ nonVoidIds ids = [NonVoid id | id <- ids, not (isVoidRep (idPrimRep id))]
mkCgIdInfo :: DynFlags -> Id -> LambdaFormInfo -> CmmExpr -> CgIdInfo
mkCgIdInfo dflags id lf expr
= CgIdInfo { cg_id = id, cg_lf = lf
- , cg_loc = CmmLoc expr,
- cg_tag = lfDynTag dflags lf }
+ , cg_loc = CmmLoc expr }
litIdInfo :: DynFlags -> Id -> LambdaFormInfo -> CmmLit -> CgIdInfo
litIdInfo dflags id lf lit
= CgIdInfo { cg_id = id, cg_lf = lf
- , cg_loc = CmmLoc (addDynTag dflags (CmmLit lit) tag)
- , cg_tag = tag }
+ , cg_loc = CmmLoc (addDynTag dflags (CmmLit lit) tag) }
where
tag = lfDynTag dflags lf
lneIdInfo :: DynFlags -> Id -> [NonVoid Id] -> CgIdInfo
lneIdInfo dflags id regs
= CgIdInfo { cg_id = id, cg_lf = lf
- , cg_loc = LneLoc blk_id (map (idToReg dflags) regs)
- , cg_tag = lfDynTag dflags lf }
+ , cg_loc = LneLoc blk_id (map (idToReg dflags) regs) }
where
lf = mkLFLetNoEscape
blk_id = mkBlockId (idUnique id)
diff --git a/compiler/codeGen/StgCmmMonad.hs b/compiler/codeGen/StgCmmMonad.hs
index def0ffe..dd7e950 100644
--- a/compiler/codeGen/StgCmmMonad.hs
+++ b/compiler/codeGen/StgCmmMonad.hs
@@ -187,7 +187,6 @@ data CgIdInfo
-- virtue of being externalised, for splittable C
, cg_lf :: LambdaFormInfo
, cg_loc :: CgLoc -- CmmExpr for the *tagged* value
- , cg_tag :: {-# UNPACK #-} !DynTag -- Cache for (lfDynTag cg_lf)
}
data CgLoc
More information about the ghc-commits
mailing list