X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDsBinds.lhs;h=4db8dbf1a046a2f647bca0f4293762ad6d7ecf0e;hb=438596897ebbe25a07e1c82085cfbc5bdb00f09e;hp=f340fba197bf2b8cf81c9edd4dc1c475d2f22816;hpb=fda89b29c748c6cd2fe1fdb477d5c0e8f7d32b90;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/DsBinds.lhs b/ghc/compiler/deSugar/DsBinds.lhs index f340fba..4db8dbf 100644 --- a/ghc/compiler/deSugar/DsBinds.lhs +++ b/ghc/compiler/deSugar/DsBinds.lhs @@ -1,5 +1,5 @@ % -% (c) The GRASP/AQUA Project, Glasgow University, 1992-1996 +% (c) The GRASP/AQUA Project, Glasgow University, 1992-1998 % \section[DsBinds]{Pattern-matching bindings (HsBinds and MonoBinds)} @@ -8,98 +8,58 @@ in that the @Rec@/@NonRec@/etc structure is thrown away (whereas at lower levels it is preserved with @let@/@letrec@s). \begin{code} +module DsBinds ( dsMonoBinds ) where + #include "HsVersions.h" -module DsBinds ( dsBinds, dsMonoBinds ) where -IMP_Ubiq() -#if defined(__GLASGOW_HASKELL__) && __GLASGOW_HASKELL__ <= 201 -IMPORT_DELOOPER(DsLoop) -- break dsExpr-ish loop -#else -import {-# SOURCE #-} DsExpr -#endif +import {-# SOURCE #-} DsExpr( dsExpr ) import HsSyn -- lots of things import CoreSyn -- lots of things import CoreUtils ( coreExprType ) -import TcHsSyn ( SYN_IE(TypecheckedHsBinds), SYN_IE(TypecheckedHsExpr), - SYN_IE(TypecheckedMonoBinds), - SYN_IE(TypecheckedPat) - ) +import TcHsSyn ( TypecheckedMonoBinds ) import DsMonad import DsGRHSs ( dsGuarded ) import DsUtils import Match ( matchWrapper ) -import BasicTypes ( SYN_IE(Module) ) +import BasicTypes ( Module, RecFlag(..) ) import CmdLineOpts ( opt_SccProfilingOn, opt_AutoSccsOnAllToplevs, - opt_AutoSccsOnExportedToplevs, opt_CompilingGhcInternals ) -import CostCentre ( mkAutoCC, IsCafCC(..), mkAllDictsCC, preludeDictsCostCentre ) -import Id ( idType, SYN_IE(DictVar), GenId, SYN_IE(Id) ) -import ListSetOps ( minusList, intersectLists ) + opt_AutoSccsOnExportedToplevs + ) +import CostCentre ( mkAutoCC, IsCafCC(..), mkAllDictsCC ) +import Id ( idType, Id ) +import VarEnv import Name ( isExported ) -import PprType ( GenType ) -import Outputable ( PprStyle(..) ) -import Type ( mkTyVarTy, isDictTy, instantiateTy +import Type ( mkTyVarTy, isDictTy, substTy ) -import TyVar ( tyVarSetToList, GenTyVar{-instance Eq-} ) -import TysPrim ( voidTy ) -import Util ( isIn, panic, assertPanic ) +import TysWiredIn ( voidTy ) +import Outputable \end{code} %************************************************************************ %* * -\subsection[toplevel-and-regular-DsBinds]{Regular and top-level @dsBinds@} -%* * -%************************************************************************ - -Like @dsBinds@, @dsBind@ returns a @[CoreBinding]@, but it may be -that some of the binders are of unboxed type. This is sorted out when -the caller wraps the bindings round an expression. - -\begin{code} - -dsBinds :: Bool -- if candidate, auto add scc's on toplevs ? - -> TypecheckedHsBinds - -> DsM [CoreBinding] - -dsBinds _ EmptyBinds = returnDs [] -dsBinds auto_scc (ThenBinds binds_1 binds_2) - = andDs (++) (dsBinds auto_scc binds_1) (dsBinds auto_scc binds_2) - -dsBinds auto_scc (MonoBind binds sigs is_rec) - = dsMonoBinds auto_scc is_rec binds [] `thenDs` \ prs -> - returnDs (if is_rec then - [Rec prs] - else - [NonRec binder rhs | (binder,rhs) <- prs] - ) -\end{code} - - -%************************************************************************ -%* * \subsection[dsMonoBinds]{Desugaring a @MonoBinds@} %* * %************************************************************************ \begin{code} dsMonoBinds :: Bool -- False => don't (auto-)annotate scc on toplevs. - -> RecFlag -> TypecheckedMonoBinds -> [(Id,CoreExpr)] -- Put this on the end (avoid quadratic append) -> DsM [(Id,CoreExpr)] -- Result -dsMonoBinds _ is_rec EmptyMonoBinds rest = returnDs rest +dsMonoBinds _ EmptyMonoBinds rest = returnDs rest -dsMonoBinds auto_scc is_rec (AndMonoBinds binds_1 binds_2) rest - = dsMonoBinds auto_scc is_rec binds_2 rest `thenDs` \ rest' -> - dsMonoBinds auto_scc is_rec binds_1 rest' +dsMonoBinds auto_scc (AndMonoBinds binds_1 binds_2) rest + = dsMonoBinds auto_scc binds_2 rest `thenDs` \ rest' -> + dsMonoBinds auto_scc binds_1 rest' -dsMonoBinds _ is_rec (CoreMonoBind var core_expr) rest +dsMonoBinds _ (CoreMonoBind var core_expr) rest = returnDs ((var, core_expr) : rest) -dsMonoBinds _ is_rec (VarMonoBind var expr) rest +dsMonoBinds _ (VarMonoBind var expr) rest = dsExpr expr `thenDs` \ core_expr -> -- Dictionary bindings are always VarMonoBinds, so @@ -108,71 +68,73 @@ dsMonoBinds _ is_rec (VarMonoBind var expr) rest returnDs ((var, core_expr') : rest) -dsMonoBinds auto_scc is_rec (FunMonoBind fun _ matches locn) rest +dsMonoBinds auto_scc (FunMonoBind fun _ matches locn) rest = putSrcLocDs locn $ matchWrapper (FunMatch fun) matches error_string `thenDs` \ (args, body) -> - addAutoScc auto_scc (fun, mkValLam args body) `thenDs` \ pair -> + addAutoScc auto_scc (fun, mkLams args body) `thenDs` \ pair -> returnDs (pair : rest) where - error_string = "function " ++ showForErr fun + error_string = "function " ++ showSDoc (ppr fun) -dsMonoBinds _ is_rec (PatMonoBind pat grhss_and_binds locn) rest +dsMonoBinds _ (PatMonoBind pat grhss_and_binds locn) rest = putSrcLocDs locn $ dsGuarded grhss_and_binds `thenDs` \ body_expr -> mkSelectorBinds pat body_expr `thenDs` \ sel_binds -> returnDs (sel_binds ++ rest) -- Common special case: no type or dictionary abstraction -dsMonoBinds auto_scc is_rec (AbsBinds [] [] exports binds) rest +dsMonoBinds auto_scc (AbsBinds [] [] exports binds) rest = mapDs (addAutoScc auto_scc) [(global, Var local) | (_, global, local) <- exports] `thenDs` \ exports' -> - dsMonoBinds False is_rec binds (exports' ++ rest) + dsMonoBinds False binds (exports' ++ rest) -- Another common case: one exported variable -- All non-recursive bindings come through this way -dsMonoBinds auto_scc is_rec (AbsBinds all_tyvars dicts [(tyvars, global, local)] binds) rest +dsMonoBinds auto_scc (AbsBinds all_tyvars dicts [(tyvars, global, local)] binds) rest = ASSERT( all (`elem` tyvars) all_tyvars ) - dsMonoBinds False is_rec binds [] `thenDs` \ core_prs -> + dsMonoBinds False binds [] `thenDs` \ core_prs -> let - core_binds | is_rec = [Rec core_prs] - | otherwise = [NonRec b e | (b,e) <- core_prs] + -- Always treat the binds as recursive, because the typechecker + -- makes rather mixed-up dictionary bindings + core_binds = [Rec core_prs] in - addAutoScc auto_scc (global, mkLam tyvars dicts $ - mkCoLetsAny core_binds (Var local)) `thenDs` \ global' -> + addAutoScc auto_scc (global, mkLams tyvars $ mkLams dicts $ + mkLets core_binds (Var local)) `thenDs` \ global' -> returnDs (global' : rest) -dsMonoBinds auto_scc is_rec (AbsBinds all_tyvars dicts exports binds) rest - = dsMonoBinds False is_rec binds [] `thenDs` \ core_prs -> +dsMonoBinds auto_scc (AbsBinds all_tyvars dicts exports binds) rest + = dsMonoBinds False binds [] `thenDs` \ core_prs -> let - core_binds | is_rec = [Rec core_prs] - | otherwise = [NonRec b e | (b,e) <- core_prs] - - tup_expr = mkLam all_tyvars dicts $ - mkCoLetsAny core_binds $ - mkTupleExpr locals - locals = [local | (_, _, local) <- exports] - local_tys = map idType locals + core_binds = [Rec core_prs] + + tup_expr = mkTupleExpr locals + tup_ty = coreExprType tup_expr + poly_tup_expr = mkLams all_tyvars $ mkLams dicts $ + mkLets core_binds tup_expr + locals = [local | (_, _, local) <- exports] + local_tys = map idType locals in - newSysLocalDs (coreExprType tup_expr) `thenDs` \ tup_id -> + newSysLocalDs (coreExprType poly_tup_expr) `thenDs` \ poly_tup_id -> let - dict_args = map VarArg dicts + dict_args = map Var dicts mk_bind (tyvars, global, local) n -- locals !! n == local = -- Need to make fresh locals to bind in the selector, because -- some of the tyvars will be bound to voidTy - newSysLocalsDs (map (instantiateTy env) local_tys) `thenDs` \ locals' -> + newSysLocalsDs (map (substTy env) local_tys) `thenDs` \ locals' -> + newSysLocalDs (substTy env tup_ty) `thenDs` \ tup_id -> addAutoScc auto_scc - (global, mkLam tyvars dicts $ - mkTupleSelector locals' (locals' !! n) $ - mkValApp (mkTyApp (Var tup_id) ty_args) dict_args) + (global, mkLams tyvars $ mkLams dicts $ + mkTupleSelector locals' (locals' !! n) tup_id $ + mkApps (mkTyApps (Var poly_tup_id) ty_args) dict_args) where mk_ty_arg all_tyvar | all_tyvar `elem` tyvars = mkTyVarTy all_tyvar | otherwise = voidTy ty_args = map mk_ty_arg all_tyvars - env = all_tyvars `zip` ty_args + env = all_tyvars `zipVarEnv` ty_args in zipWithDs mk_bind exports [0..] `thenDs` \ export_binds -> -- don't scc (auto-)annotate the tuple itself. - returnDs ((tup_id, tup_expr) : (export_binds ++ rest)) + returnDs ((poly_tup_id, poly_tup_expr) : (export_binds ++ rest)) \end{code} @@ -191,13 +153,13 @@ addAutoScc auto_scc_candidate pair@(bndr, core_expr) | auto_scc_candidate && worthSCC core_expr && (opt_AutoSccsOnAllToplevs || (isExported bndr && opt_AutoSccsOnExportedToplevs)) = getModuleAndGroupDs `thenDs` \ (mod,grp) -> - returnDs (bndr, SCC (mkAutoCC bndr mod grp IsNotCafCC) core_expr) + returnDs (bndr, Note (SCC (mkAutoCC bndr mod grp IsNotCafCC)) core_expr) | otherwise = returnDs pair -worthSCC (SCC _ _) = False -worthSCC (Con _ _) = False -worthSCC core_expr = True +worthSCC (Note (SCC _) _) = False +worthSCC (Con _ _) = False +worthSCC core_expr = True \end{code} If profiling and dealing with a dict binding, wrap the dict in "_scc_ DICT ": @@ -209,14 +171,9 @@ addDictScc var rhs || not (isDictTy (idType var)) = returnDs rhs -- That's easy: do nothing - | opt_CompilingGhcInternals - = returnDs (SCC prel_dicts_cc rhs) - | otherwise = getModuleAndGroupDs `thenDs` \ (mod, grp) -> -- ToDo: do -dicts-all flag (mark dict things with individual CCs) - returnDs (SCC (mkAllDictsCC mod grp False) rhs) - -prel_dicts_cc = preludeDictsCostCentre False{-not dupd-} -- ditto + returnDs (Note (SCC (mkAllDictsCC mod grp False)) rhs) \end{code}