\begin{code}
module CoreTidy (
- tidyCorePgm, tidyExpr,
+ tidyCorePgm, tidyExpr, tidyCoreExpr,
tidyBndr, tidyBndrs
) where
#include "HsVersions.h"
-import CmdLineOpts ( DynFlags, DynFlag(..), opt_OmitInterfacePragmas, dopt )
+import CmdLineOpts ( DynFlags, DynFlag(..), opt_OmitInterfacePragmas )
import CoreSyn
import CoreUnfold ( noUnfolding, mkTopUnfolding, okToUnfoldInHiFile )
import CoreFVs ( ruleSomeFreeVars, exprSomeFreeVars )
import VarEnv
import VarSet
import Var ( Id, Var )
-import Id ( idType, idInfo, idName, isExportedId,
- mkVanillaId, mkId, isLocalId, omitIfaceSigForId,
- setIdStrictness, setIdDemandInfo,
+import Id ( idType, idInfo, idName, isExportedId,
+ idSpecialisation, idUnique, isDataConWrapId,
+ mkVanillaGlobal, isLocalId, isRecordSelector,
+ setIdUnfolding, hasNoBinding, mkUserLocal
)
-import IdInfo ( constantIdInfo,
- specInfo, setSpecInfo,
- cprInfo, setCprInfo,
- inlinePragInfo, setInlinePragInfo, isNeverInlinePrag,
- strictnessInfo, setStrictnessInfo, isBottomingStrictness,
- unfoldingInfo, setUnfoldingInfo,
- demandInfo,
- occInfo, isLoopBreaker,
- workerInfo, setWorkerInfo, WorkerInfo(..)
- )
+import IdInfo {- loads of stuff -}
import Name ( getOccName, nameOccName, globaliseName, setNameOcc,
- localiseName, mkLocalName, isGlobalName
+ localiseName, isGlobalName
)
+import NameEnv ( filterNameEnv )
import OccName ( TidyOccEnv, initTidyOccEnv, tidyOccName )
import Type ( tidyTopType, tidyType, tidyTyVar )
import Module ( Module, moduleName )
-import HscTypes ( PersistentCompilerState( pcs_PRS ), PersistentRenamerState( prsOrig ),
- OrigNameEnv( origNames ), OrigNameNameEnv
+import HscTypes ( PersistentCompilerState( pcs_PRS ),
+ PersistentRenamerState( prsOrig ),
+ NameSupply( nsNames ), OrigNameCache,
+ TypeEnv, extendTypeEnvList,
+ ModDetails(..), TyThing(..)
)
-import Unique ( Uniquable(..) )
import FiniteMap ( lookupFM, addToFM )
import Maybes ( maybeToBool, orElse )
import ErrUtils ( showPass )
import SrcLoc ( noSrcLoc )
import UniqFM ( mapUFM )
-import Outputable
import List ( partition )
import Util ( mapAccumL )
+import Outputable
\end{code}
IdEnv Bool
-
Step 2: Tidy the program
~~~~~~~~~~~~~~~~~~~~~~~~
Next we traverse the bindings top to bottom. For each top-level
- Give external Ids the same Unique as they had before
if the name is in the renamer's name cache
- - Give the Id its final IdInfo; in ptic,
- * Its flavour becomes ConstantId, reflecting the fact that
- from now on we regard it as a constant, not local, Id
+ - Give the Id its UTTERLY FINAL IdInfo; in ptic,
+ * Its IdDetails becomes VanillaGlobal, reflecting the fact that
+ from now on we regard it as a global, not local, Id
+
* its unfolding, if it should have one
+
+ * its arity, computed from the number of visible lambdas
+
+ * its CAF info, computed from what is free in its RHS
+
Finally, substitute these new top-level binders consistently
throughout, including in unfoldings. We also tidy binders in
\begin{code}
tidyCorePgm :: DynFlags -> Module
-> PersistentCompilerState
- -> [CoreBind] -> [IdCoreRule]
- -> IO (PersistentCompilerState, [CoreBind], [IdCoreRule])
-tidyCorePgm dflags mod pcs binds_in orphans_in
+ -> CgInfoEnv -- Information from the back end,
+ -- to be splatted into the IdInfo
+ -> ModDetails
+ -> IO (PersistentCompilerState, ModDetails)
+
+tidyCorePgm dflags mod pcs cg_info_env
+ (ModDetails { md_types = env_tc, md_insts = insts_tc,
+ md_binds = binds_in, md_rules = orphans_in })
= do { showPass dflags "Tidy Core"
- ; let ext_ids = findExternalSet binds_in orphans_in
+ ; let ext_ids = findExternalSet binds_in orphans_in
+ ; let ext_rules = findExternalRules binds_in orphans_in ext_ids
- ; let ((orig_env', occ_env, subst_env), binds_out)
- = mapAccumL (tidyTopBind mod ext_ids) init_tidy_env binds_in
+ ; let ((orig_env', occ_env, subst_env), tidy_binds)
+ = mapAccumL (tidyTopBind mod ext_ids cg_info_env)
+ init_tidy_env binds_in
- ; let orphans_out = tidyIdRules (occ_env,subst_env) orphans_in
+ ; let tidy_rules = tidyIdRules (occ_env,subst_env) ext_rules
- ; let pcs' = pcs { pcs_PRS = prs { prsOrig = orig { origNames = orig_env' }}}
+ ; let prs' = prs { prsOrig = orig { nsNames = orig_env' } }
+ pcs' = pcs { pcs_PRS = prs' }
- ; endPass dflags "Tidy Core" (dopt Opt_D_dump_simpl dflags ||
- dopt Opt_D_verbose_core2core dflags)
- binds_out
+ ; let final_ids = [ id | bind <- tidy_binds
+ , id <- bindersOf bind
+ , isGlobalName (idName id)]
- ; return (pcs', binds_out, orphans_out)
+ -- Dfuns are local Ids that might have
+ -- changed their unique during tidying
+ ; let lookup_dfun_id id = lookupVarEnv subst_env id `orElse`
+ pprPanic "lookup_dfun_id" (ppr id)
+
+
+ ; let tidy_type_env = mkFinalTypeEnv env_tc final_ids
+ tidy_dfun_ids = map lookup_dfun_id insts_tc
+
+ ; let tidy_details = ModDetails { md_types = tidy_type_env,
+ md_rules = tidy_rules,
+ md_insts = tidy_dfun_ids,
+ md_binds = tidy_binds }
+
+ ; endPass dflags "Tidy Core" Opt_D_dump_simpl tidy_binds
+
+ ; return (pcs', tidy_details)
}
where
-- We also make sure to avoid any exported binders. Consider
-- The second exported decl must 'get' the name 'f', so we
-- have to put 'f' in the avoids list before we get to the first
-- decl. tidyTopId then does a no-op on exported binders.
- prs = pcs_PRS pcs
- orig = prsOrig prs
- orig_env = origNames orig
+ prs = pcs_PRS pcs
+ orig = prsOrig prs
+ orig_env = nsNames orig
+
+ init_tidy_env = (orig_env, initTidyOccEnv avoids, emptyVarEnv)
+ avoids = [getOccName bndr | bndr <- bindersOfBinds binds_in,
+ isGlobalName (idName bndr)]
- init_tidy_env = (orig_env, initTidyOccEnv avoids, emptyVarEnv)
- avoids = [getOccName bndr | bndr <- bindersOfBinds binds_in,
- isGlobalName (idName bndr)]
+tidyCoreExpr :: CoreExpr -> IO CoreExpr
+tidyCoreExpr expr = return (tidyExpr emptyTidyEnv expr)
\end{code}
%************************************************************************
%* *
+\subsection{Write a new interface file}
+%* *
+%************************************************************************
+
+\begin{code}
+mkFinalTypeEnv :: TypeEnv -- From typechecker
+ -> [Id] -- Final Ids
+ -> TypeEnv
+
+mkFinalTypeEnv type_env final_ids
+ = extendTypeEnvList (filterNameEnv keep_it type_env)
+ (map AnId final_ids)
+ where
+ -- The competed type environment is gotten from
+ -- a) keeping the types and classes
+ -- b) removing all Ids,
+ -- c) adding Ids with correct IdInfo, including unfoldings,
+ -- gotten from the bindings
+ -- From (c) we keep only those Ids with Global names;
+ -- the CoreTidy pass makes sure these are all and only
+ -- the externally-accessible ones
+ -- This truncates the type environment to include only the
+ -- exported Ids and things needed from them, which saves space
+ --
+ -- However, we do keep things like constructors, which should not appear
+ -- in interface files, because they are needed by importing modules when
+ -- using the compilation manager
+
+ -- We keep "hasNoBinding" Ids, notably constructor workers,
+ -- because they won't appear in the bindings from which final_ids are derived!
+ keep_it (AnId id) = hasNoBinding id -- Remove all Ids except constructor workers
+ keep_it other = True -- Keep all TyCons and Classes
+\end{code}
+
+\begin{code}
+findExternalRules :: [CoreBind]
+ -> [IdCoreRule] -- Orphan rules
+ -> IdEnv a -- Ids that are exported, so we need their rules
+ -> [IdCoreRule]
+ -- The complete rules are gotten by combining
+ -- a) the orphan rules
+ -- b) rules embedded in the top-level Ids
+findExternalRules binds orphan_rules ext_ids
+ | opt_OmitInterfacePragmas = []
+ | otherwise
+ = orphan_rules ++ local_rules
+ where
+ local_rules = [ (id, rule)
+ | id <- bindersOfBinds binds,
+ id `elemVarEnv` ext_ids,
+ rule <- rulesRules (idSpecialisation id),
+ not (isBuiltinRule rule)
+ -- We can't print builtin rules in interface files
+ -- Since they are built in, an importing module
+ -- will have access to them anyway
+ ]
+\end{code}
+
+%************************************************************************
+%* *
\subsection{Step 1: finding externals}
%* *
%************************************************************************
\begin{code}
findExternalSet :: [CoreBind] -> [IdCoreRule]
- -> IdEnv Bool -- True <=> show unfolding
+ -> IdEnv Bool -- In domain => external
+ -- Range = True <=> show unfolding
-- Step 1 from the notes above
findExternalSet binds orphan_rules
= foldr find init_needed binds
where
orphan_rule_ids :: IdSet
- orphan_rule_ids = unionVarSets [ ruleSomeFreeVars isIdAndLocal rule
+ orphan_rule_ids = unionVarSets [ ruleSomeFreeVars isLocalId rule
| (_, rule) <- orphan_rules]
init_needed :: IdEnv Bool
init_needed = mapUFM (\_ -> False) orphan_rule_ids
need_id needed_set id = id `elemVarEnv` needed_set || isExportedId id
need_pr needed_set (id,rhs) = need_id needed_set id
-isIdAndLocal id = isId id && isLocalId id
-
addExternal :: (Id,CoreExpr) -> IdEnv Bool -> IdEnv Bool
-- The Id is needed; extend the needed set
-- with it and its dependents (free vars etc)
rhs_is_small && -- Small enough
okToUnfoldInHiFile rhs -- No casms etc
- unfold_ids | show_unfold = exprSomeFreeVars isIdAndLocal rhs
+ unfold_ids | show_unfold = exprSomeFreeVars isLocalId rhs
| otherwise = emptyVarSet
worker_ids = case worker_info of
\begin{code}
-type TopTidyEnv = (OrigNameNameEnv, TidyOccEnv, VarEnv Var)
+type TopTidyEnv = (OrigNameCache, TidyOccEnv, VarEnv Var)
-- TopTidyEnv: when tidying we need to know
-- * orig_env: Any pre-ordained Names. These may have arisen because the
-- invented an Id whose name is $wf (but with a different unique)
-- we want to rename it to have unique r77, so that we can do easy
-- comparisons with stuff from the interface file
-
--- * occ_env: The TidyOccEnv, which tells us which local occurrences are 'used'
-
+--
+-- * occ_env: The TidyOccEnv, which tells us which local occurrences
+-- are 'used'
+--
-- * subst_env: A Var->Var mapping that substitutes the new Var for the old
\end{code}
\begin{code}
tidyTopBind :: Module
- -> IdEnv Bool -- Domain = Ids that should be exernal
+ -> IdEnv Bool -- Domain = Ids that should be external
-- True <=> their unfolding is external too
+ -> CgInfoEnv
-> TopTidyEnv -> CoreBind
-> (TopTidyEnv, CoreBind)
-tidyTopBind mod ext_ids env (NonRec bndr rhs)
- = (env', NonRec bndr' rhs')
+tidyTopBind mod ext_ids cg_info_env top_tidy_env (NonRec bndr rhs)
+ = ((orig,occ,subst) , NonRec bndr' rhs')
where
- rhs' = tidyTopRhs env rhs
- (env', bndr') = tidyTopBinder mod ext_ids env rhs' env bndr
+ ((orig,occ,subst), bndr')
+ = tidyTopBinder mod ext_ids cg_info_env rec_tidy_env rhs' top_tidy_env bndr
+ rec_tidy_env = (occ,subst)
+ rhs' = tidyExpr rec_tidy_env rhs
-tidyTopBind mod ext_ids env (Rec prs)
+tidyTopBind mod ext_ids cg_info_env top_tidy_env (Rec prs)
= (final_env, Rec prs')
where
- (final_env, prs') = mapAccumL do_one env prs
- do_one env (bndr,rhs) = (env', (bndr', rhs'))
- where
- rhs' = tidyTopRhs final_env rhs
- (env', bndr') = tidyTopBinder mod ext_ids final_env
- rhs env bndr
+ (final_env@(_,occ,subst), prs') = mapAccumL do_one top_tidy_env prs
+ rec_tidy_env = (occ,subst)
+
+ do_one top_tidy_env (bndr,rhs)
+ = ((orig,occ,subst), (bndr',rhs'))
+ where
+ ((orig,occ,subst), bndr')
+ = tidyTopBinder mod ext_ids cg_info_env
+ rec_tidy_env rhs' top_tidy_env bndr
-tidyTopRhs :: TopTidyEnv -> CoreExpr -> CoreExpr
- -- Just an impedence matcher
-tidyTopRhs (_, occ_env, subst_env) rhs = tidyExpr (occ_env, subst_env) rhs
+ rhs' = tidyExpr rec_tidy_env rhs
tidyTopBinder :: Module -> IdEnv Bool
- -> TopTidyEnv -> CoreExpr
+ -> CgInfoEnv
+ -> TidyEnv -> CoreExpr
+ -- The TidyEnv is used to tidy the IdInfo
+ -- The expr is the already-tided RHS
+ -- Both are knot-tied: don't look at them!
-> TopTidyEnv -> Id -> (TopTidyEnv, Id)
-tidyTopBinder mod ext_ids env_idinfo rhs env@(orig_env, occ_env, subst_env) id
- | omitIfaceSigForId id -- Don't mess with constructors,
- = (env, id) -- record selectors, and the like
+ -- NB: tidyTopBinder doesn't affect the unique supply
+
+tidyTopBinder mod ext_ids cg_info_env tidy_env rhs
+ env@(orig_env2, occ_env2, subst_env2) id
+
+ | isDataConWrapId id -- Don't tidy constructor wrappers
+ = (env, id) -- The Id is stored in the TyCon, so it would be bad
+ -- if anything changed
+
+-- HACK ALERT: we *do* tidy record selectors. Reason: they mention error
+-- messages, which may be floated out:
+-- x_field pt = case pt of
+-- Rect x y -> y
+-- Pol _ _ -> error "buggle wuggle"
+-- The error message will be floated out so we'll get
+-- lvl5 = error "buggle wuggle"
+-- x_field pt = case pt of
+-- Rect x y -> y
+-- Pol _ _ -> lvl5
+--
+-- When this happens, it's vital that the Id exposed to importing modules
+-- (by ghci) mentions lvl5 in its unfolding, not the un-tidied version.
+--
+-- What about the Id in the TyCon? It probably shouldn't be in the TyCon at
+-- all, but in any case it will have the error message inline so it won't matter.
+
+
+ | isRecordSelector id -- We can't use the "otherwise" case, because that
+ -- forgets the IdDetails, which forgets that this is
+ -- a record selector, which confuses an importing module
+ = (env, id `setIdUnfolding` unfold_info)
| otherwise
-- This function is the heart of Step 2
= ((orig_env', occ_env', subst_env'), id')
where
- (orig_env', occ_env', name') = tidyTopName mod orig_env occ_env
+ (orig_env', occ_env', name') = tidyTopName mod orig_env2 occ_env2
is_external
(idName id)
- ty' = tidyTopType (idType id)
- idinfo' = tidyIdInfo env_idinfo is_external unfold_info id
- id' = mkId name' ty' idinfo'
- subst_env' = extendVarEnv subst_env id id'
+ ty' = tidyTopType (idType id)
+ cg_info = lookupCgInfo cg_info_env name'
+ idinfo' = tidyIdInfo tidy_env is_external unfold_info cg_info id
+
+ id' = mkVanillaGlobal name' ty' idinfo'
+ subst_env' = extendVarEnv subst_env2 id id'
maybe_external = lookupVarEnv ext_ids id
is_external = maybeToBool maybe_external
unfold_info | show_unfold = mkTopUnfolding rhs
| otherwise = noUnfolding
-tidyIdInfo (_, occ_env, subst_env) is_external unfold_info id
+
+tidyIdInfo tidy_env is_external unfold_info cg_info id
| opt_OmitInterfacePragmas || not is_external
- -- No IdInfo if the Id isn't
- = constantIdInfo
+ -- No IdInfo if the Id isn't external, or if we don't have -O
+ = vanillaIdInfo
+ `setCgInfo` cg_info
+ `setStrictnessInfo` strictnessInfo core_idinfo
+ -- Keep strictness; it's used by CorePrep
| otherwise
- = constantIdInfo `setCprInfo` cprInfo core_idinfo
- `setStrictnessInfo` strictnessInfo core_idinfo
- `setInlinePragInfo` inlinePragInfo core_idinfo
- `setUnfoldingInfo` unfold_info
- `setWorkerInfo` tidyWorker tidy_env (workerInfo core_idinfo)
- `setSpecInfo` tidyRules tidy_env (specInfo core_idinfo)
+ = vanillaIdInfo
+ `setCgInfo` cg_info
+ `setCprInfo` cprInfo core_idinfo
+ `setStrictnessInfo` strictnessInfo core_idinfo
+ `setInlinePragInfo` inlinePragInfo core_idinfo
+ `setUnfoldingInfo` unfold_info
+ `setWorkerInfo` tidyWorker tidy_env (workerInfo core_idinfo)
+ -- NB: we throw away the Rules
+ -- They have already been extracted by findExternalRules
where
- tidy_env = (occ_env, subst_env)
core_idinfo = idInfo id
+
+-- This is where we set names to local/global based on whether they really are
+-- externally visible (see comment at the top of this module). If the name
+-- was previously local, we have to give it a unique occurrence name if
+-- we intend to globalise it.
tidyTopName mod orig_env occ_env external name
- | global && internal = (orig_env, occ_env, localiseName name)
+ | global && internal = (orig_env, occ_env, localiseName name)
+
| local && internal = (orig_env, occ_env', setNameOcc name occ')
- | global && external = (orig_env, occ_env, name)
- | local && external = globalise
- where
+ -- Even local, internal names must get a unique occurrence, because
+ -- if we do -split-objs we globalise the name later, n the code generator
+
+ | global && external = (orig_env, occ_env, name)
+ -- Global names are assumed to have been allocated by the renamer,
+ -- so they already have the "right" unique
+
+ | local && external = case lookupFM orig_env key of
+ Just orig -> (orig_env, occ_env', orig)
+ Nothing -> (addToFM orig_env key global_name, occ_env', global_name)
-- If we want to globalise a currently-local name, check
-- whether we have already assigned a unique for it.
-- If so, use it; if not, extend the table
- globalise = case lookupFM orig_env key of
- Just orig -> (orig_env, occ_env', orig)
- Nothing -> (addToFM orig_env key global_name, occ_env', global_name)
+ where
(occ_env', occ') = tidyOccName occ_env (nameOccName name)
key = (moduleName mod, occ')
global_name = globaliseName (setNameOcc name occ') mod
local = not global
internal = not external
-tidyIdRules :: TidyEnv -> [IdCoreRule] -> [IdCoreRule]
-tidyIdRules env rules
- = [ (tidyVarOcc env fn, tidyRule env rule) | (fn,rule) <- rules ]
-
-
+------------ Worker --------------
tidyWorker tidy_env (HasWorker work_id wrap_arity)
= HasWorker (tidyVarOcc tidy_env work_id) wrap_arity
-tidyWorker tidy_env NoWorker
+tidyWorker tidy_env other
= NoWorker
-tidyRules :: TidyEnv -> CoreRules -> CoreRules
-tidyRules env (Rules rules fvs)
- = Rules (map (tidyRule env) rules)
- (foldVarSet tidy_set_elem emptyVarSet fvs)
- where
- tidy_set_elem var new_set = extendVarSet new_set (tidyVarOcc env var)
+------------ Rules --------------
+tidyIdRules :: TidyEnv -> [IdCoreRule] -> [IdCoreRule]
+tidyIdRules env [] = []
+tidyIdRules env ((fn,rule) : rules)
+ = tidyRule env rule =: \ rule ->
+ tidyIdRules env rules =: \ rules ->
+ ((tidyVarOcc env fn, rule) : rules)
tidyRule :: TidyEnv -> CoreRule -> CoreRule
tidyRule env rule@(BuiltinRule _) = rule
tidyRule env (Rule name vars tpl_args rhs)
- = (Rule name vars' (map (tidyExpr env') tpl_args) (tidyExpr env' rhs))
- where
- (env', vars') = tidyBndrs env vars
+ = tidyBndrs env vars =: \ (env', vars) ->
+ map (tidyExpr env') tpl_args =: \ tpl_args ->
+ (Rule name vars tpl_args (tidyExpr env' rhs))
\end{code}
-
%************************************************************************
%* *
\subsection{Step 2: inner tidying
\begin{code}
tidyBind :: TidyEnv
-> CoreBind
- -> (TidyEnv, CoreBind)
+ -> (TidyEnv, CoreBind)
+
tidyBind env (NonRec bndr rhs)
- = let
- (env', bndr') = tidyBndr env bndr
- rhs' = tidyExpr env' rhs
- -- We use env' when tidying the RHS even though it's not
- -- strictly necessary; it makes the tidied code pretty
- -- hard to read if we don't!
- in
- (env', NonRec bndr' rhs')
+ = tidyBndrWithRhs env (bndr,rhs) =: \ (env', bndr') ->
+ (env', NonRec bndr' (tidyExpr env' rhs))
tidyBind env (Rec prs)
- = (final_env, Rec prs')
- where
- (final_env, prs') = mapAccumL do_one env prs
- do_one env (bndr,rhs) = (env', (bndr', rhs'))
- where
- (env', bndr') = tidyBndr env bndr
- rhs' = tidyExpr final_env rhs
+ = mapAccumL tidyBndrWithRhs env prs =: \ (env', bndrs') ->
+ map (tidyExpr env') (map snd prs) =: \ rhss' ->
+ (env', Rec (zip bndrs' rhss'))
-tidyExpr env (Type ty) = Type (tidyType env ty)
-tidyExpr env (Lit lit) = Lit lit
-tidyExpr env (App f a) = App (tidyExpr env f) (tidyExpr env a)
-tidyExpr env (Note n e) = Note (tidyNote env n) (tidyExpr env e)
-tidyExpr env (Let b e) = Let b' (tidyExpr env' e)
- where
- (env', b') = tidyBind env b
+tidyExpr env (Var v) = Var (tidyVarOcc env v)
+tidyExpr env (Type ty) = Type (tidyType env ty)
+tidyExpr env (Lit lit) = Lit lit
+tidyExpr env (App f a) = App (tidyExpr env f) (tidyExpr env a)
+tidyExpr env (Note n e) = Note (tidyNote env n) (tidyExpr env e)
-tidyExpr env (Case e b alts) = Case (tidyExpr env e) b' (map (tidyAlt env') alts)
- where
- (env', b') = tidyBndr env b
+tidyExpr env (Let b e)
+ = tidyBind env b =: \ (env', b') ->
+ Let b' (tidyExpr env' e)
-tidyExpr env (Var v) = Var (tidyVarOcc env v)
+tidyExpr env (Case e b alts)
+ = tidyBndr env b =: \ (env', b) ->
+ Case (tidyExpr env e) b (map (tidyAlt env') alts)
-tidyExpr env (Lam b e) = Lam b' (tidyExpr env' e)
- where
- (env', b') = tidyBndr env b
+tidyExpr env (Lam b e)
+ = tidyBndr env b =: \ (env', b) ->
+ Lam b (tidyExpr env' e)
-tidyAlt env (con, vs, rhs) = (con, vs', tidyExpr env' rhs)
- where
- (env', vs') = tidyBndrs env vs
-tidyNote env (Coerce t1 t2) = Coerce (tidyType env t1) (tidyType env t2)
+tidyAlt env (con, vs, rhs)
+ = tidyBndrs env vs =: \ (env', vs) ->
+ (con, vs, tidyExpr env' rhs)
+tidyNote env (Coerce t1 t2) = Coerce (tidyType env t1) (tidyType env t2)
tidyNote env note = note
\end{code}
Just v' -> v'
Nothing -> v
+-- tidyBndr is used for lambda and case binders
tidyBndr :: TidyEnv -> Var -> (TidyEnv, Var)
-tidyBndr env var | isTyVar var = tidyTyVar env var
- | otherwise = tidyId env var
+tidyBndr env var
+ | isTyVar var = tidyTyVar env var
+ | otherwise = tidyId env var
tidyBndrs :: TidyEnv -> [Var] -> (TidyEnv, [Var])
tidyBndrs env vars = mapAccumL tidyBndr env vars
+-- tidyBndrWithRhs is used for let binders
+tidyBndrWithRhs :: TidyEnv -> (Id, CoreExpr) -> (TidyEnv, Var)
+tidyBndrWithRhs env (id,rhs) = tidyId env id
+
tidyId :: TidyEnv -> Id -> (TidyEnv, Id)
tidyId env@(tidy_env, var_env) id
= -- Non-top-level variables
let
-- Give the Id a fresh print-name, *and* rename its type
- -- The SrcLoc isn't important now, though we could extract it from the Id
- name' = mkLocalName (getUnique id) occ' noSrcLoc
+ -- The SrcLoc isn't important now,
+ -- though we could extract it from the Id
+ --
+ -- All local Ids now have the same IdInfo, which should save some
+ -- space.
(tidy_env', occ') = tidyOccName tidy_env (getOccName id)
- ty' = tidyType env (idType id)
- idinfo = idInfo id
- id' = mkVanillaId name' ty'
- `setIdStrictness` strictnessInfo idinfo
- `setIdDemandInfo` demandInfo idinfo
- -- NB: This throws away the IdInfo of the Id, which we
- -- no longer need. That means we don't need to
- -- run over it with env, nor renumber it.
- --
- -- The exception is strictness and demand info, which
- -- is used to decide whether to use let or case for
- -- function arguments and let bindings
-
+ ty' = tidyType (tidy_env,var_env) (idType id)
+ id' = mkUserLocal occ' (idUnique id) ty' noSrcLoc
var_env' = extendVarEnv var_env id id'
in
- ((tidy_env', var_env'), id')
+ ((tidy_env', var_env'), id')
+\end{code}
+
+\begin{code}
+m =: k = m `seq` k m
\end{code}
projects / ghc-hetmet.git / blobdiff