X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FcoreSyn%2FCoreTidy.lhs;h=64d7c738d6c7890c03d55a8cf29a2a6e1043e363;hb=7679e59613dd45c326d7e1cdc35d364c9e90a5c1;hp=245474841e28161e717c1c00dead7957888c3c81;hpb=c25aa25e9bdb2b2acd0ed973ffd727ee46eb147c;p=ghc-hetmet.git diff --git a/ghc/compiler/coreSyn/CoreTidy.lhs b/ghc/compiler/coreSyn/CoreTidy.lhs index 2454748..64d7c73 100644 --- a/ghc/compiler/coreSyn/CoreTidy.lhs +++ b/ghc/compiler/coreSyn/CoreTidy.lhs @@ -5,7 +5,7 @@ \begin{code} module CoreTidy ( - tidyCorePgm, tidyExpr, + tidyCorePgm, tidyExpr, tidyCoreExpr, tidyBndr, tidyBndrs ) where @@ -14,40 +14,38 @@ module CoreTidy ( import CmdLineOpts ( DynFlags, DynFlag(..), opt_OmitInterfacePragmas ) import CoreSyn import CoreUnfold ( noUnfolding, mkTopUnfolding, okToUnfoldInHiFile ) -import CoreUtils ( exprArity ) import CoreFVs ( ruleSomeFreeVars, exprSomeFreeVars ) import CoreLint ( showPass, endPass ) import VarEnv import VarSet import Var ( Id, Var ) -import Id ( idType, idInfo, idName, isExportedId, - idCafInfo, mkId, isLocalId, isImplicitId, - idFlavour, modifyIdInfo, idArity +import Id ( idType, idInfo, idName, isExportedId, + idSpecialisation, idUnique, + mkVanillaGlobal, isLocalId, isImplicitId, + hasNoBinding, mkUserLocal ) import IdInfo {- loads of stuff -} import Name ( getOccName, nameOccName, globaliseName, setNameOcc, - localiseName, mkLocalName, isGlobalName, isDllName + localiseName, isGlobalName ) +import NameEnv ( filterNameEnv ) import OccName ( TidyOccEnv, initTidyOccEnv, tidyOccName ) import Type ( tidyTopType, tidyType, tidyTyVar ) import Module ( Module, moduleName ) -import PrimOp ( PrimOp(..), setCCallUnique ) import HscTypes ( PersistentCompilerState( pcs_PRS ), PersistentRenamerState( prsOrig ), - NameSupply( nsNames ), OrigNameCache + NameSupply( nsNames ), OrigNameCache, + TypeEnv, extendTypeEnvList, + ModDetails(..), TyThing(..) ) -import UniqSupply -import DataCon ( dataConName ) -import Literal ( isLitLitLit ) import FiniteMap ( lookupFM, addToFM ) import Maybes ( maybeToBool, orElse ) import ErrUtils ( showPass ) import SrcLoc ( noSrcLoc ) import UniqFM ( mapUFM ) -import Outputable -import FastTypes import List ( partition ) import Util ( mapAccumL ) +import Outputable \end{code} @@ -92,16 +90,9 @@ binder - Give external Ids the same Unique as they had before if the name is in the renamer's name cache - - Clone all local Ids. This means that Tidy Core has the property - that all Ids are unique, rather than the weaker guarantee of - no clashes which the simplifier provides. - - - Give each dynamic CCall occurrence a fresh unique; this is - rather like the cloning step above. - - Give the Id its UTTERLY FINAL IdInfo; in ptic, - * Its flavour becomes ConstantId, reflecting the fact that - from now on we regard it as a constant, not local, Id + * 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 @@ -117,28 +108,49 @@ RHSs, so that they print nicely in interfaces. \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 - - ; us <- mkSplitUniqSupply 't' -- for "tidy" + ; let ext_ids = findExternalSet binds_in orphans_in + ; let ext_rules = findExternalRules binds_in orphans_in ext_ids - ; let ((us1, orig_env', occ_env, subst_env), binds_out) - = mapAccumL (tidyTopBind mod ext_ids) - (init_tidy_env us) 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, _) - = initUs us1 (tidyIdRules (occ_env,subst_env) orphans_in) + ; let tidy_rules = tidyIdRules (occ_env,subst_env) ext_rules ; let prs' = prs { prsOrig = orig { nsNames = orig_env' } } pcs' = pcs { pcs_PRS = prs' } - ; endPass dflags "Tidy Core" Opt_D_dump_simpl binds_out + ; let final_ids = [ id | bind <- tidy_binds + , id <- bindersOf bind + , isGlobalName (idName id)] + + -- 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) - ; return (pcs', binds_out, orphans_out) + + ; 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 @@ -153,11 +165,74 @@ tidyCorePgm dflags mod pcs binds_in orphans_in orig = prsOrig prs orig_env = nsNames orig - init_tidy_env us = (us, orig_env, initTidyOccEnv avoids, emptyVarEnv) + init_tidy_env = (orig_env, initTidyOccEnv avoids, emptyVarEnv) avoids = [getOccName bndr | bndr <- bindersOfBinds binds_in, - isGlobalName (idName bndr)] + 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 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} %************************************************************************ %* * @@ -167,13 +242,14 @@ tidyCorePgm dflags mod pcs binds_in orphans_in \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 @@ -201,8 +277,6 @@ findExternalSet binds orphan_rules 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) @@ -242,7 +316,7 @@ addExternal (id,rhs) needed 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 @@ -259,7 +333,7 @@ addExternal (id,rhs) needed \begin{code} -type TopTidyEnv = (UniqSupply, OrigNameCache, 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 @@ -273,9 +347,6 @@ type TopTidyEnv = (UniqSupply, OrigNameCache, TidyOccEnv, VarEnv Var) -- are 'used' -- -- * subst_env: A Var->Var mapping that substitutes the new Var for the old --- --- * uniqsuppy: so we can clone any Ids with non-preordained names. --- \end{code} @@ -283,47 +354,44 @@ type TopTidyEnv = (UniqSupply, OrigNameCache, TidyOccEnv, VarEnv Var) tidyTopBind :: Module -> 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) - = ((us2,orig,occ,subst) , NonRec bndr' rhs') +tidyTopBind mod ext_ids cg_info_env top_tidy_env (NonRec bndr rhs) + = ((orig,occ,subst) , NonRec bndr' rhs') where - ((us1,orig,occ,subst), bndr') - = tidyTopBinder mod ext_ids tidy_env rhs' caf_info env bndr - tidy_env = (occ,subst) - caf_info = hasCafRefs (const True) rhs' - (rhs',us2) = initUs us1 (tidyExpr tidy_env rhs) + ((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@(_,_,occ,subst), prs') = mapAccumL do_one env prs - final_tidy_env = (occ,subst) + (final_env@(_,occ,subst), prs') = mapAccumL do_one top_tidy_env prs + rec_tidy_env = (occ,subst) - do_one env (bndr,rhs) - = ((us',orig,occ,subst), (bndr',rhs')) + do_one top_tidy_env (bndr,rhs) + = ((orig,occ,subst), (bndr',rhs')) where - ((us,orig,occ,subst), bndr') - = tidyTopBinder mod ext_ids final_tidy_env rhs' caf_info env bndr - (rhs', us') = initUs us (tidyExpr final_tidy_env rhs) - - -- the CafInfo for a recursive group says whether *any* rhs in - -- the group may refer indirectly to a CAF (because then, they all do). - (bndrs, rhss) = unzip prs' - caf_info = hasCafRefss pred rhss - pred v = v `notElem` bndrs + ((orig,occ,subst), bndr') + = tidyTopBinder mod ext_ids cg_info_env + rec_tidy_env rhs' top_tidy_env bndr + rhs' = tidyExpr rec_tidy_env rhs tidyTopBinder :: Module -> IdEnv Bool - -> TidyEnv -> CoreExpr -> CafInfo + -> 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) + -- NB: tidyTopBinder doesn't affect the unique supply -tidyTopBinder mod ext_ids tidy_env rhs caf_info - env@(us, orig_env2, occ_env2, subst_env2) id +tidyTopBinder mod ext_ids cg_info_env tidy_env rhs + env@(orig_env2, occ_env2, subst_env2) id | isImplicitId id -- Don't mess with constructors, = (env, id) -- record selectors, and the like @@ -337,18 +405,16 @@ tidyTopBinder mod ext_ids tidy_env rhs caf_info -- The rhs is already tidied - = ((us_r, orig_env', occ_env', subst_env'), id') + = ((orig_env', occ_env', subst_env'), id') where - (us_l, us_r) = splitUniqSupply us - (orig_env', occ_env', name') = tidyTopName mod orig_env2 occ_env2 is_external (idName id) - ty' = tidyTopType (idType id) - idinfo' = tidyIdInfo us_l tidy_env - is_external unfold_info arity_info caf_info id + ty' = tidyTopType (idType id) + cg_info = lookupCgInfo cg_info_env name' + idinfo' = tidyIdInfo tidy_env is_external unfold_info cg_info id - id' = mkId name' ty' idinfo' + id' = mkVanillaGlobal name' ty' idinfo' subst_env' = extendVarEnv subst_env2 id id' maybe_external = lookupVarEnv ext_ids id @@ -359,44 +425,28 @@ tidyTopBinder mod ext_ids tidy_env rhs caf_info unfold_info | show_unfold = mkTopUnfolding rhs | otherwise = noUnfolding - arity_info = exprArity rhs - -tidyIdInfo us tidy_env is_external unfold_info arity_info caf_info id +tidyIdInfo tidy_env is_external unfold_info cg_info id | opt_OmitInterfacePragmas || not is_external -- No IdInfo if the Id isn't external, or if we don't have -O - = mkIdInfo new_flavour caf_info + = vanillaIdInfo + `setCgInfo` cg_info `setStrictnessInfo` strictnessInfo core_idinfo - `setArityInfo` ArityExactly arity_info - -- Keep strictness, arity and CAF info; it's used by the code generator + -- Keep strictness; it's used by CorePrep | otherwise - = let (rules', _) = initUs us (tidyRules tidy_env (specInfo core_idinfo)) - in - mkIdInfo new_flavour caf_info + = vanillaIdInfo + `setCgInfo` cg_info `setCprInfo` cprInfo core_idinfo `setStrictnessInfo` strictnessInfo core_idinfo `setInlinePragInfo` inlinePragInfo core_idinfo `setUnfoldingInfo` unfold_info - `setWorkerInfo` tidyWorker tidy_env arity_info (workerInfo core_idinfo) - `setSpecInfo` rules' - `setArityInfo` ArityExactly arity_info - -- this is the final IdInfo, it must agree with the - -- code finally generated (i.e. NO more transformations - -- after this!). + `setWorkerInfo` tidyWorker tidy_env (workerInfo core_idinfo) + -- NB: we throw away the Rules + -- They have already been extracted by findExternalRules where core_idinfo = idInfo id - -- A DFunId must stay a DFunId, so that we can gather the - -- DFunIds up later. Other local things become ConstantIds. - new_flavour = case flavourInfo core_idinfo of - VanillaId -> ConstantId - ExportedId -> ConstantId - ConstantId -> ConstantId -- e.g. Default methods - DictFunId -> DictFunId - flavour -> pprTrace "tidyIdInfo" (ppr id <+> ppFlavourInfo flavour) - flavour - -- 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 @@ -429,55 +479,25 @@ tidyTopName mod orig_env occ_env external name internal = not external ------------ Worker -------------- --- We only treat a function as having a worker if --- the exported arity (which is now the number of visible lambdas) --- is the same as the arity at the moment of the w/w split --- If so, we can safely omit the unfolding inside the wrapper, and --- instead re-generate it from the type/arity/strictness info --- But if the arity has changed, we just take the simple path and --- put the unfolding into the interface file, forgetting the fact --- that it's a wrapper. --- --- How can this happen? Sometimes we get --- f = coerce t (\x y -> $wf x y) --- at the moment of w/w split; but the eta reducer turns it into --- f = coerce t $wf --- which is perfectly fine except that the exposed arity so far as --- the code generator is concerned (zero) differs from the arity --- when we did the split (2). --- --- All this arises because we use 'arity' to mean "exactly how many --- top level lambdas are there" in interface files; but during the --- compilation of this module it means "how many things can I apply --- this to". -tidyWorker tidy_env real_arity (HasWorker work_id wrap_arity) - | real_arity == wrap_arity +tidyWorker tidy_env (HasWorker work_id wrap_arity) = HasWorker (tidyVarOcc tidy_env work_id) wrap_arity -tidyWorker tidy_env real_arity other +tidyWorker tidy_env other = NoWorker ------------ Rules -------------- -tidyIdRules :: TidyEnv -> [IdCoreRule] -> UniqSM [IdCoreRule] -tidyIdRules env [] = returnUs [] +tidyIdRules :: TidyEnv -> [IdCoreRule] -> [IdCoreRule] +tidyIdRules env [] = [] tidyIdRules env ((fn,rule) : rules) - = tidyRule env rule `thenUs` \ rule -> - tidyIdRules env rules `thenUs` \ rules -> - returnUs ((tidyVarOcc env fn, rule) : rules) - -tidyRules :: TidyEnv -> CoreRules -> UniqSM CoreRules -tidyRules env (Rules rules fvs) - = mapUs (tidyRule env) rules `thenUs` \ rules -> - returnUs (Rules rules (foldVarSet tidy_set_elem emptyVarSet fvs)) - where - tidy_set_elem var new_set = extendVarSet new_set (tidyVarOcc env var) + = tidyRule env rule =: \ rule -> + tidyIdRules env rules =: \ rules -> + ((tidyVarOcc env fn, rule) : rules) -tidyRule :: TidyEnv -> CoreRule -> UniqSM CoreRule -tidyRule env rule@(BuiltinRule _) = returnUs rule +tidyRule :: TidyEnv -> CoreRule -> CoreRule +tidyRule env rule@(BuiltinRule _) = rule tidyRule env (Rule name vars tpl_args rhs) - = tidyBndrs env vars `thenUs` \ (env', vars) -> - mapUs (tidyExpr env') tpl_args `thenUs` \ tpl_args -> - tidyExpr env' rhs `thenUs` \ rhs -> - returnUs (Rule name vars tpl_args rhs) + = tidyBndrs env vars =: \ (env', vars) -> + map (tidyExpr env') tpl_args =: \ tpl_args -> + (Rule name vars tpl_args (tidyExpr env' rhs)) \end{code} %************************************************************************ @@ -489,54 +509,40 @@ tidyRule env (Rule name vars tpl_args rhs) \begin{code} tidyBind :: TidyEnv -> CoreBind - -> UniqSM (TidyEnv, CoreBind) + -> (TidyEnv, CoreBind) + tidyBind env (NonRec bndr rhs) - = tidyBndrWithRhs env (bndr,rhs) `thenUs` \ (env', bndr') -> - tidyExpr env' rhs `thenUs` \ rhs' -> - returnUs (env', NonRec bndr' rhs') + = tidyBndrWithRhs env (bndr,rhs) =: \ (env', bndr') -> + (env', NonRec bndr' (tidyExpr env' rhs)) tidyBind env (Rec prs) - = mapAccumLUs tidyBndrWithRhs env prs `thenUs` \ (env', bndrs') -> - mapUs (tidyExpr env') (map snd prs) `thenUs` \ rhss' -> - returnUs (env', Rec (zip bndrs' rhss')) - -tidyExpr env (Var v) - = fiddleCCall v `thenUs` \ v -> - returnUs (Var (tidyVarOcc env v)) + = mapAccumL tidyBndrWithRhs env prs =: \ (env', bndrs') -> + map (tidyExpr env') (map snd prs) =: \ rhss' -> + (env', Rec (zip bndrs' rhss')) -tidyExpr env (Type ty) = returnUs (Type (tidyType env ty)) -tidyExpr env (Lit lit) = returnUs (Lit lit) -tidyExpr env (App f a) - = tidyExpr env f `thenUs` \ f -> - tidyExpr env a `thenUs` \ a -> - returnUs (App f a) - -tidyExpr env (Note n e) - = tidyExpr env e `thenUs` \ e -> - returnUs (Note (tidyNote env n) e) +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 (Let b e) - = tidyBind env b `thenUs` \ (env', b') -> - tidyExpr env' e `thenUs` \ e -> - returnUs (Let b' e) + = tidyBind env b =: \ (env', b') -> + Let b' (tidyExpr env' e) tidyExpr env (Case e b alts) - = tidyExpr env e `thenUs` \ e -> - tidyBndr env b `thenUs` \ (env', b) -> - mapUs (tidyAlt env') alts `thenUs` \ alts -> - returnUs (Case e b alts) + = tidyBndr env b =: \ (env', b) -> + Case (tidyExpr env e) b (map (tidyAlt env') alts) tidyExpr env (Lam b e) - = tidyBndr env b `thenUs` \ (env', b) -> - tidyExpr env' e `thenUs` \ e -> - returnUs (Lam b e) + = tidyBndr env b =: \ (env', b) -> + Lam b (tidyExpr env' e) tidyAlt env (con, vs, rhs) - = tidyBndrs env vs `thenUs` \ (env', vs) -> - tidyExpr env' rhs `thenUs` \ rhs -> - returnUs (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 @@ -555,147 +561,36 @@ tidyVarOcc (_, var_env) v = case lookupVarEnv var_env v of Nothing -> v -- tidyBndr is used for lambda and case binders -tidyBndr :: TidyEnv -> Var -> UniqSM (TidyEnv, Var) +tidyBndr :: TidyEnv -> Var -> (TidyEnv, Var) tidyBndr env var - | isTyVar var = returnUs (tidyTyVar env var) - | otherwise = tidyId env var vanillaIdInfo + | isTyVar var = tidyTyVar env var + | otherwise = tidyId env var -tidyBndrs :: TidyEnv -> [Var] -> UniqSM (TidyEnv, [Var]) -tidyBndrs env vars = mapAccumLUs tidyBndr env vars +tidyBndrs :: TidyEnv -> [Var] -> (TidyEnv, [Var]) +tidyBndrs env vars = mapAccumL tidyBndr env vars -- tidyBndrWithRhs is used for let binders -tidyBndrWithRhs :: TidyEnv -> (Var, CoreExpr) -> UniqSM (TidyEnv, Var) -tidyBndrWithRhs env (id,rhs) - = tidyId env id idinfo - where - idinfo = vanillaIdInfo `setArityInfo` ArityExactly (exprArity rhs) - -- 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. - -tidyId :: TidyEnv -> Id -> IdInfo -> UniqSM (TidyEnv, Id) -tidyId env@(tidy_env, var_env) id idinfo +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 - getUniqueUs `thenUs` \ uniq -> 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 uniq occ' noSrcLoc + -- + -- All local Ids now have the same IdInfo, which should save some + -- space. (tidy_env', occ') = tidyOccName tidy_env (getOccName id) ty' = tidyType (tidy_env,var_env) (idType id) - id' = mkId name' ty' idinfo + id' = mkUserLocal occ' (idUnique id) ty' noSrcLoc var_env' = extendVarEnv var_env id id' in - returnUs ((tidy_env', var_env'), id') - - -fiddleCCall id - = case idFlavour id of - PrimOpId (CCallOp ccall) -> - -- Make a guaranteed unique name for a dynamic ccall. - getUniqueUs `thenUs` \ uniq -> - returnUs (modifyIdInfo (`setFlavourInfo` - PrimOpId (CCallOp (setCCallUnique ccall uniq))) id) - other_flavour -> - returnUs id + ((tidy_env', var_env'), id') \end{code} -%************************************************************************ -%* * -\subsection{Figuring out CafInfo for an expression} -%* * -%************************************************************************ - \begin{code} -hasCafRefs :: (Id -> Bool) -> CoreExpr -> CafInfo -hasCafRefss :: (Id -> Bool) -> [CoreExpr] -> CafInfo - -- predicate returns True for a given Id if we look at this Id when - -- calculating the result. Used to *avoid* looking at the CafInfo - -- field for an Id that is part of the current recursive group. - -hasCafRefs p expr = if isCAF expr || isFastTrue (cafRefs p expr) - then MayHaveCafRefs - else NoCafRefs - - -- used for recursive groups. The whole group is set to - -- "MayHaveCafRefs" if at least one of the group is a CAF or - -- refers to any CAFs. -hasCafRefss p exprs = if any isCAF exprs || isFastTrue (cafRefss p exprs) - then MayHaveCafRefs - else NoCafRefs - -cafRefs p (Var id) - | p id - = case idCafInfo id of - NoCafRefs -> fastBool False - MayHaveCafRefs -> fastBool True - | otherwise - = fastBool False - -cafRefs p (Lit l) = fastBool False -cafRefs p (App f a) = cafRefs p f `fastOr` cafRefs p a -cafRefs p (Lam x e) = cafRefs p e -cafRefs p (Let b e) = cafRefss p (rhssOfBind b) `fastOr` cafRefs p e -cafRefs p (Case e bndr alts) = cafRefs p e `fastOr` cafRefss p (rhssOfAlts alts) -cafRefs p (Note n e) = cafRefs p e -cafRefs p (Type t) = fastBool False - -cafRefss p [] = fastBool False -cafRefss p (e:es) = cafRefs p e `fastOr` cafRefss p es - --- Decide whether a closure looks like a CAF or not. In an effort to --- keep the number of CAFs (and hence the size of the SRTs) down, we --- would also like to look at the expression and decide whether it --- requires a small bounded amount of heap, so we can ignore it as a --- CAF. In these cases however, we would need to use an additional --- CAF list to keep track of non-collectable CAFs. - --- We mark real CAFs as `MayHaveCafRefs' because this information is --- used to decide whether a particular closure needs to be referenced --- in an SRT or not. - -isCAF :: CoreExpr -> Bool -isCAF e = not (rhsIsNonUpd e) - {- ToDo: check type for onceness, i.e. non-updatable thunks? -} - -rhsIsNonUpd :: CoreExpr -> Bool -- True => Value-lambda, constructor, PAP -rhsIsNonUpd (Lam b e) = isId b || rhsIsNonUpd e -rhsIsNonUpd (Note (SCC _) e) = False -rhsIsNonUpd (Note _ e) = rhsIsNonUpd e -rhsIsNonUpd other_expr - = go other_expr 0 [] - where - go (Var f) n_args args = idAppIsNonUpd f n_args args - - go (App f a) n_args args - | isTypeArg a = go f n_args args - | otherwise = go f (n_args + 1) (a:args) - - go (Note (SCC _) f) n_args args = False - go (Note _ f) n_args args = go f n_args args - - go other n_args args = False - -idAppIsNonUpd :: Id -> Int -> [CoreExpr] -> Bool -idAppIsNonUpd id n_val_args args - = case idFlavour id of - DataConId con | not (isDynConApp con args) -> True - other -> n_val_args < idArity id - -isDynConApp con args = isDllName (dataConName con) || any isDynArg args - - -- Does this argument refer to something in a different DLL, - -- or is a LitLit? Constructor arguments which are in another - -- DLL or are LitLits aren't compiled into static constructors - -- (see CoreToStg), so we have to take that into account here. -isDynArg :: CoreExpr -> Bool -isDynArg (Var v) = isDllName (idName v) -isDynArg (Note _ e) = isDynArg e -isDynArg (Lit lit) = isLitLitLit lit -isDynArg (App e _) = isDynArg e -- must be a type app -isDynArg (Lam _ e) = isDynArg e -- must be a type lam - --- We consider partial applications to be non-updatable. NOTE: this --- must match how CoreToStg marks the closure. +m =: k = m `seq` k m \end{code}