X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FdeSugar%2FDesugar.lhs;h=c2bfd69f1d6a402b3e6b45bd977cebaa89caea3b;hb=7c3d4a1f2b2529ce300b8acc1d26ad98312b9e96;hp=5880de0eb923ba7e70a865a3b6e4c3443a2f0bd8;hpb=4ef18ea237ee070678970dbdd49714014dd9efbf;p=ghc-hetmet.git diff --git a/ghc/compiler/deSugar/Desugar.lhs b/ghc/compiler/deSugar/Desugar.lhs index 5880de0..c2bfd69 100644 --- a/ghc/compiler/deSugar/Desugar.lhs +++ b/ghc/compiler/deSugar/Desugar.lhs @@ -9,15 +9,16 @@ module Desugar ( deSugar, deSugarExpr ) where #include "HsVersions.h" import CmdLineOpts ( DynFlag(..), dopt, opt_SccProfilingOn ) -import HscTypes ( ModGuts(..), ModGuts, HscEnv(..), ExternalPackageState(..), - PersistentCompilerState(..), Dependencies(..), - lookupType, unQualInScope ) +import HscTypes ( ModGuts(..), ModGuts, HscEnv(..), GhciMode(..), + Dependencies(..), TypeEnv, + unQualInScope, availsToNameSet ) import HsSyn ( MonoBinds, RuleDecl(..), RuleBndr(..), HsExpr(..), HsBinds(..), MonoBinds(..) ) import TcHsSyn ( TypecheckedRuleDecl, TypecheckedHsExpr ) import TcRnTypes ( TcGblEnv(..), ImportAvails(..) ) import MkIface ( mkUsageInfo ) -import Id ( Id ) +import Id ( Id, setIdLocalExported, idName ) +import Name ( Name, isExternalName ) import CoreSyn import PprCore ( pprIdRules, pprCoreExpr ) import Subst ( substExpr, mkSubst, mkInScopeSet ) @@ -27,20 +28,23 @@ import DsBinds ( dsMonoBinds, AutoScc(..) ) import DsForeign ( dsForeigns ) import DsExpr () -- Forces DsExpr to be compiled; DsBinds only -- depends on DsExpr.hi-boot. -import Module ( Module, moduleEnvElts ) +import Module ( Module, moduleEnvElts, emptyModuleEnv ) import Id ( Id ) -import NameEnv ( lookupNameEnv ) +import RdrName ( GlobalRdrEnv ) +import NameSet import VarEnv import VarSet -import Bag ( isEmptyBag, mapBag ) +import Bag ( isEmptyBag, mapBag, emptyBag ) import CoreLint ( showPass, endPass ) -import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings, addShortWarnLocLine ) +import CoreFVs ( ruleRhsFreeVars ) +import ErrUtils ( doIfSet, dumpIfSet_dyn, pprBagOfWarnings, + addShortWarnLocLine, errorsFound ) import Outputable import qualified Pretty import UniqSupply ( mkSplitUniqSupply ) import SrcLoc ( SrcLoc ) -import FastString import DATA_IOREF ( readIORef ) +import FastString \end{code} %************************************************************************ @@ -50,44 +54,50 @@ import DATA_IOREF ( readIORef ) %************************************************************************ \begin{code} -deSugar :: HscEnv -> PersistentCompilerState - -> TcGblEnv -> IO ModGuts - -deSugar hsc_env pcs - (TcGblEnv { tcg_mod = mod, - tcg_type_env = type_env, - tcg_usages = usage_var, - tcg_imports = imports, - tcg_exports = exports, - tcg_rdr_env = rdr_env, - tcg_fix_env = fix_env, - tcg_deprecs = deprecs, - tcg_insts = insts, - tcg_binds = binds, - tcg_fords = fords, - tcg_rules = rules }) +deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts) +-- Can modify PCS by faulting in more declarations + +deSugar hsc_env + tcg_env@(TcGblEnv { tcg_mod = mod, + tcg_type_env = type_env, + tcg_imports = imports, + tcg_exports = exports, + tcg_dus = dus, + tcg_inst_uses = dfun_uses_var, + tcg_rdr_env = rdr_env, + tcg_fix_env = fix_env, + tcg_deprecs = deprecs, + tcg_insts = insts }) = do { showPass dflags "Desugar" - ; us <- mkSplitUniqSupply 'd' - ; usages <- readIORef usage_var -- Do desugaring - ; let ((ds_binds, ds_rules, ds_fords), ds_warns) - = initDs dflags us lookup mod - (dsProgram binds rules fords) - - warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns) + ; let { is_boot = imp_dep_mods imports } + ; (results, warnings) <- initDs hsc_env mod type_env is_boot $ + dsProgram ghci_mode tcg_env + + ; let { (ds_binds, ds_rules, ds_fords) = results + ; warns = mapBag mk_warn warnings + ; warn_doc = pprBagOfWarnings warns } -- Display any warnings - ; doIfSet (not (isEmptyBag ds_warns)) + ; doIfSet (not (isEmptyBag warnings)) (printErrs warn_doc) + -- If warnings are considered errors, leave. + ; if errorsFound dflags (warns, emptyBag) + then return Nothing + else do + -- Lint result if necessary - ; endPass dflags "Desugar" Opt_D_dump_ds ds_binds + { endPass dflags "Desugar" Opt_D_dump_ds ds_binds -- Dump output ; doIfSet (dopt Opt_D_dump_ds dflags) (printDump (ppr_ds_rules ds_rules)) + ; dfun_uses <- readIORef dfun_uses_var -- What dfuns are used + ; let used_names = allUses dus emptyNameSet `unionNameSets` dfun_uses + ; usages <- mkUsageInfo hsc_env imports used_names ; let deps = Deps { dep_mods = moduleEnvElts (imp_dep_mods imports), dep_pkgs = imp_dep_pkgs imports, @@ -96,7 +106,7 @@ deSugar hsc_env pcs mg_module = mod, mg_exports = exports, mg_deps = deps, - mg_usages = mkUsageInfo hsc_env eps imports usages, + mg_usages = usages, mg_dir_imps = [m | (m,_) <- moduleEnvElts (imp_mods imports)], mg_rdr_env = rdr_env, mg_fix_env = fix_env, @@ -107,11 +117,12 @@ deSugar hsc_env pcs mg_binds = ds_binds, mg_foreign = ds_fords } - ; return mod_guts - } + ; return (Just mod_guts) + }} where dflags = hsc_dflags hsc_env + ghci_mode = hsc_mode hsc_env print_unqual = unQualInScope rdr_env -- Desugarer warnings are SDocs; here we @@ -119,39 +130,25 @@ deSugar hsc_env pcs mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc) mk_warn (loc, sdoc) = addShortWarnLocLine loc print_unqual sdoc - -- The lookup function passed to initDs is used for well-known Ids, - -- such as fold, build, cons etc, so the chances are - -- it'll be found in the package symbol table. That's - -- why we don't merge all these tables - eps = pcs_EPS pcs - pte = eps_PTE eps - hpt = hsc_HPT hsc_env - lookup n = case lookupType hpt pte n of { - Just v -> v ; - other -> - case lookupNameEnv type_env n of - Just v -> v ; - other -> pprPanic "Desugar: lookup:" (ppr n) - } deSugarExpr :: HscEnv - -> PersistentCompilerState - -> Module -> PrintUnqualified + -> Module -> GlobalRdrEnv -> TypeEnv -> TypecheckedHsExpr -> IO CoreExpr -deSugarExpr hsc_env pcs mod_name unqual tc_expr +deSugarExpr hsc_env this_mod rdr_env type_env tc_expr = do { showPass dflags "Desugar" ; us <- mkSplitUniqSupply 'd' -- Do desugaring - ; let (core_expr, ds_warns) = initDs dflags us lookup mod_name (dsExpr tc_expr) - warn_doc = pprBagOfWarnings (mapBag mk_warn ds_warns) - mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc) - mk_warn (loc,sdoc) = addShortWarnLocLine loc unqual sdoc + ; let { is_boot = emptyModuleEnv } -- Assume no hi-boot files when + -- doing stuff from the command line + ; (core_expr, ds_warns) <- initDs hsc_env this_mod type_env is_boot $ + dsExpr tc_expr - -- Display any warnings + -- Display any warnings + -- Note: if -Werror is used, we don't signal an error here. ; doIfSet (not (isEmptyBag ds_warns)) - (printErrs warn_doc) + (printErrs (pprBagOfWarnings (mapBag mk_warn ds_warns))) -- Dump output ; dumpIfSet_dyn dflags Opt_D_dump_ds "Desugared" (pprCoreExpr core_expr) @@ -159,32 +156,89 @@ deSugarExpr hsc_env pcs mod_name unqual tc_expr ; return core_expr } where - dflags = hsc_dflags hsc_env - hpt = hsc_HPT hsc_env - pte = eps_PTE (pcs_EPS pcs) - lookup n = case lookupType hpt pte n of - Just v -> v - other -> pprPanic "Desugar: lookup:" (ppr n) - -dsProgram all_binds rules fo_decls - = dsMonoBinds auto_scc all_binds [] `thenDs` \ core_prs -> - dsForeigns fo_decls `thenDs` \ (ds_fords, foreign_binds) -> + dflags = hsc_dflags hsc_env + print_unqual = unQualInScope rdr_env + + mk_warn :: (SrcLoc,SDoc) -> (SrcLoc, Pretty.Doc) + mk_warn (loc,sdoc) = addShortWarnLocLine loc print_unqual sdoc + + +dsProgram ghci_mode (TcGblEnv { tcg_exports = exports, + tcg_keep = keep_alive, + tcg_binds = binds, + tcg_fords = fords, + tcg_rules = rules }) + = dsMonoBinds auto_scc binds [] `thenDs` \ core_prs -> + dsForeigns fords `thenDs` \ (ds_fords, foreign_prs) -> + let + all_prs = foreign_prs ++ core_prs + local_bndrs = mkVarSet (map fst all_prs) + in + mappM (dsRule local_bndrs) rules `thenDs` \ ds_rules -> let - ds_binds = [Rec (foreign_binds ++ core_prs)] + final_prs = addExportFlags ghci_mode exports keep_alive + local_bndrs all_prs ds_rules + ds_binds = [Rec final_prs] -- Notice that we put the whole lot in a big Rec, even the foreign binds -- When compiling PrelFloat, which defines data Float = F# Float# -- we want F# to be in scope in the foreign marshalling code! -- You might think it doesn't matter, but the simplifier brings all top-level -- things into the in-scope set before simplifying; so we get no unfolding for F#! - - local_binders = mkVarSet (bindersOfBinds ds_binds) in - mapDs (dsRule local_binders) rules `thenDs` \ ds_rules -> returnDs (ds_binds, ds_rules, ds_fords) where auto_scc | opt_SccProfilingOn = TopLevel | otherwise = NoSccs +-- addExportFlags +-- Set the no-discard flag if either +-- a) the Id is exported +-- b) it's mentioned in the RHS of an orphan rule +-- c) it's in the keep-alive set +-- +-- It means that the binding won't be discarded EVEN if the binding +-- ends up being trivial (v = w) -- the simplifier would usually just +-- substitute w for v throughout, but we don't apply the substitution to +-- the rules (maybe we should?), so this substitution would make the rule +-- bogus. + +-- You might wonder why exported Ids aren't already marked as such; +-- it's just because the type checker is rather busy already and +-- I didn't want to pass in yet another mapping. + +addExportFlags ghci_mode exports keep_alive bndrs prs rules + = [(add_export bndr, rhs) | (bndr,rhs) <- prs] + where + add_export bndr | dont_discard bndr = setIdLocalExported bndr + | otherwise = bndr + + orph_rhs_fvs = unionVarSets [ ruleRhsFreeVars rule + | (id, rule) <- rules, + not (id `elemVarSet` bndrs) ] + -- An orphan rule must keep alive the free vars + -- of its right-hand side. + -- Non-orphan rules are attached to the Id (bndr_with_rules above) + -- and that keeps the rhs free vars alive + + dont_discard bndr = is_exported name + || name `elemNameSet` keep_alive + || bndr `elemVarSet` orph_rhs_fvs + where + name = idName bndr + + -- In interactive mode, we don't want to discard any top-level + -- entities at all (eg. do not inline them away during + -- simplification), and retain them all in the TypeEnv so they are + -- available from the command line. + -- + -- isExternalName separates the user-defined top-level names from those + -- introduced by the type checker. + is_exported :: Name -> Bool + is_exported | ghci_mode == Interactive = isExternalName + | otherwise = (`elemNameSet` export_fvs) + + export_fvs = availsToNameSet exports + ppr_ds_rules [] = empty ppr_ds_rules rules = text "" $$ text "-------------- DESUGARED RULES -----------------" $$ @@ -201,9 +255,6 @@ ppr_ds_rules rules \begin{code} dsRule :: IdSet -> TypecheckedRuleDecl -> DsM (Id, CoreRule) -dsRule in_scope (IfaceRuleOut fun rule) -- Built-in rules come this way - = returnDs (fun, rule) - dsRule in_scope (HsRule name act vars lhs rhs loc) = putSrcLocDs loc $ ds_lhs all_vars lhs `thenDs` \ (fn, args) ->