X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=c53287172a99233fcbe11d2a20748e68c0ef240d;hb=1a4238bccc8be8a71f8ebec15f25d8edf8d084ad;hp=e60fbbe2435540680d32b62dd285356e9fc70bcc;hpb=436d7d6786f82883b898c694f69df23111d06a0f;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index e60fbbe..c532871 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -1,78 +1,91 @@ % % (c) The GRASP/AQUA Project, Glasgow University, 1993-2000 % + \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( HscResult(..), hscMain, +module HscMain ( + HscResult(..), hscMain, initPersistentCompilerState #ifdef GHCI - hscStmt, + , hscStmt, hscTcExpr, hscThing, + , compileExpr #endif - initPersistentCompilerState ) where + ) where #include "HsVersions.h" #ifdef GHCI +import TcHsSyn ( TypecheckedHsExpr ) +import CodeOutput ( outputForeignStubs ) +import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) +import Linker ( HValue, linkExpr ) +import TidyPgm ( tidyCoreExpr ) +import CorePrep ( corePrepExpr ) +import Flattening ( flattenExpr ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnThing ) import RdrHsSyn ( RdrNameStmt ) -import Rename ( renameStmt ) -import ByteCodeGen ( byteCodeGen ) +import Type ( Type ) +import PrelNames ( iNTERACTIVE ) +import StringBuffer ( stringToStringBuffer ) +import Name ( Name ) +import CoreLint ( lintUnfolding ) #endif import HsSyn -import StringBuffer ( hGetStringBuffer, - stringToStringBuffer, freeStringBuffer ) +import RdrName ( nameRdrName ) +import Id ( idName ) +import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) +import StringBuffer ( hGetStringBuffer, freeStringBuffer ) import Parser -import Lex ( PState(..), ParseResult(..) ) -import SrcLoc ( mkSrcLoc ) -import Rename ( checkOldIface, renameModule, closeIfaceDecls ) +import Lex ( ParseResult(..), ExtFlags(..), mkPState ) +import SrcLoc ( mkSrcLoc, noSrcLoc ) +import TcRnDriver ( checkOldIface, tcRnModule, tcRnExtCore, tcRnIface ) +import RnEnv ( extendOrigNameCache ) import Rules ( emptyRuleBase ) -import PrelInfo ( wiredInThingEnv, wiredInThings ) -import PrelNames ( vanillaSyntaxMap, knownKeyNames ) -import MkIface ( completeIface, mkModDetailsFromIface, mkModDetails, - writeIface, pprIface ) -import TcModule +import PrelInfo ( wiredInThingEnv, wiredInThings, knownKeyNames ) +import PrelRules ( builtinRules ) +import MkIface ( mkIface ) import InstEnv ( emptyInstEnv ) import Desugar +import Flattening ( flatten ) import SimplCore import CoreUtils ( coreBindsSize ) -import CoreTidy ( tidyCorePgm ) -import CoreSat +import TidyPgm ( tidyCorePgm ) +import CorePrep ( corePrepPgm ) +import StgSyn import CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Id ( Id, idName, idFlavour, modifyIdInfo ) -import IdInfo ( setFlavourInfo, makeConstantFlavour ) -import Module ( ModuleName, moduleName, mkHomeModule, - moduleUserString ) +import Module ( emptyModuleEnv ) import CmdLineOpts -import ErrUtils ( dumpIfSet_dyn, showPass ) -import Util ( unJust ) +import DriverPhases ( isExtCore_file ) +import ErrUtils ( dumpIfSet_dyn, showPass, printError ) import UniqSupply ( mkSplitUniqSupply ) -import Bag ( emptyBag ) +import Bag ( consBag, emptyBag ) import Outputable -import Interpreter -import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) -import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), - PersistentRenamerState(..), ModuleLocation(..), - HomeSymbolTable, InteractiveContext(..), TyThing(..), - NameSupply(..), PackageRuleBase, HomeIfaceTable, - typeEnvClasses, typeEnvTyCons, emptyIfaceTable, - extendLocalRdrEnv - ) -import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) -import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName, isGlobalName, - emptyNameEnv, extendNameEnvList - ) -import Module ( Module, lookupModuleEnvByName ) +import HscTypes +import MkExternalCore ( emitExternalCore ) +import ParserCore +import ParserCoreUtils +import FiniteMap ( emptyFM ) +import Name ( nameModule, getName ) +import NameEnv ( emptyNameEnv, mkNameEnv ) +import NameSet ( emptyNameSet ) +import Module ( Module, ModLocation(..), showModMsg ) +import FastString +import Maybes ( expectJust ) + +import DATA_IOREF ( newIORef, readIORef, writeIORef ) +import UNSAFE_IO ( unsafePerformIO ) import Monad ( when ) -import Maybe ( isJust ) +import Maybe ( isJust, fromJust ) import IO \end{code} @@ -95,220 +108,316 @@ data HscResult | HscRecomp PersistentCompilerState -- updated PCS ModDetails -- new details (HomeSymbolTable additions) ModIface -- new iface (if any compilation was done) - (Maybe String) -- generated stub_h filename (in /tmp) - (Maybe String) -- generated stub_c filename (in /tmp) - (Maybe ([UnlinkedBCO],ItblEnv)) -- interpreted code, if any - + Bool -- stub_h exists + Bool -- stub_c exists + (Maybe CompiledByteCode) -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain - :: GhciMode - -> DynFlags + :: HscEnv + -> PersistentCompilerState -- IN: persistent compiler state -> Module - -> ModuleLocation -- location info - -> Bool -- source unchanged? + -> ModLocation -- location info + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) -> Maybe ModIface -- old interface, if available - -> HomeSymbolTable -- for home module ModDetails - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state -> IO HscResult -hscMain ghci_mode dflags mod location source_unchanged maybe_old_iface hst hit pcs +hscMain hsc_env pcs mod location + source_unchanged have_object maybe_old_iface = do { - showPass dflags ("Checking old interface for hs = " - ++ show (ml_hs_file location) - ++ ", hspp = " ++ show (ml_hspp_file location)); - - (pcs_ch, errs_found, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface ghci_mode dflags hit hst pcs - (unJust "hscMain" (ml_hi_file location)) - source_unchanged maybe_old_iface; - - if errs_found then - return (HscFail pcs_ch) - else do { + (pcs_ch, maybe_chk_result) <- _scc_ "checkOldIface" + checkOldIface hsc_env pcs mod + (ml_hi_file location) + source_unchanged maybe_old_iface; + case maybe_chk_result of { + Nothing -> return (HscFail pcs_ch) ; + Just (recomp_reqd, maybe_checked_iface) -> do { let no_old_iface = not (isJust maybe_checked_iface) what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; - what_next ghci_mode dflags mod location maybe_checked_iface - hst hit pcs_ch - }} + ; what_next hsc_env pcs_ch have_object + mod location maybe_checked_iface + }}} --- we definitely expect to have the old interface available -hscNoRecomp ghci_mode dflags mod location (Just old_iface) hst hit pcs_ch - | ghci_mode == OneShot + +-- hscNoRecomp definitely expects to have the old interface available +hscNoRecomp hsc_env pcs_ch have_object + mod location (Just old_iface) + | hsc_mode hsc_env == OneShot = do { - hPutStrLn stderr "compilation IS NOT required"; + when (verbosity (hsc_dflags hsc_env) > 0) $ + hPutStrLn stderr "compilation IS NOT required"; let { bomb = panic "hscNoRecomp:OneShot" }; return (HscNoRecomp pcs_ch bomb bomb) } | otherwise = do { - when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Skipping " ++ compMsg mod location); - - -- CLOSURE - (pcs_cl, closure_errs, cl_hs_decls) - <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; - if closure_errs then - return (HscFail pcs_cl) - else do { + when (verbosity (hsc_dflags hsc_env) >= 1) $ + hPutStrLn stderr ("Skipping " ++ + showModMsg have_object mod location); - -- TYPECHECK - maybe_tc_result - <- typecheckIface dflags pcs_cl hst old_iface (vanillaSyntaxMap, cl_hs_decls); + -- Typecheck + (pcs_tc, maybe_tc_result) <- tcRnIface hsc_env pcs_ch old_iface ; case maybe_tc_result of { - Nothing -> return (HscFail pcs_cl); - Just (pcs_tc, env_tc, local_rules) -> do { + Nothing -> return (HscFail pcs_tc); + Just new_details -> - -- create a new details from the closed, typechecked, old iface - let new_details = mkModDetailsFromIface env_tc local_rules - ; return (HscNoRecomp pcs_tc new_details old_iface) - }}}} + }} -compMsg mod location = - mod_str ++ take (12 - length mod_str) (repeat ' ') - ++ " (" ++ unJust "hscRecomp" (ml_hs_file location) ++ ")" - where mod_str = moduleUserString mod +hscRecomp hsc_env pcs_ch have_object + mod location maybe_checked_iface + = do { + -- what target are we shooting for? + ; let one_shot = hsc_mode hsc_env == OneShot + ; let dflags = hsc_dflags hsc_env + ; let toInterp = dopt_HscLang dflags == HscInterpreted + ; let toCore = isJust (ml_hs_file location) && + isExtCore_file (fromJust (ml_hs_file location)) + ; when (not one_shot && verbosity dflags >= 1) $ + hPutStrLn stderr ("Compiling " ++ + showModMsg (not toInterp) mod location); + + ; front_res <- if toCore then + hscCoreFrontEnd hsc_env pcs_ch location + else + hscFrontEnd hsc_env pcs_ch location -hscRecomp ghci_mode dflags mod location maybe_checked_iface hst hit pcs_ch - = do { - ; when (verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ compMsg mod location); + ; case front_res of + Left flure -> return flure; + Right (pcs_tc, ds_result) -> do { - -- what target are we shooting for? - ; let toInterp = dopt_HscLang dflags == HscInterpreted + + -- OMITTED: + -- ; seqList imported_modules (return ()) ------------------- - -- PARSE + -- FLATTENING ------------------- - ; maybe_parsed <- myParseModule dflags - (unJust "hscRecomp:hspp" (ml_hspp_file location)) - ; case maybe_parsed of { - Nothing -> return (HscFail pcs_ch); - Just rdr_module -> do { - ; let this_mod = mkHomeModule (hsModuleName rdr_module) - + ; flat_result <- _scc_ "Flattening" + flatten hsc_env pcs_tc ds_result + + ; let pcs_middle = pcs_tc + +{- Again, omit this because it loses the usage info + which is needed in mkIface. Maybe we should compute + usage info earlier. + + ; pcs_middle + <- _scc_ "pcs_middle" + if one_shot then + do init_pcs <- initPersistentCompilerState + init_prs <- initPersistentRenamerState + let + rules = pcs_rules pcs_tc + orig_tc = prsOrig (pcs_PRS pcs_tc) + new_prs = init_prs{ prsOrig=orig_tc } + + orig_tc `seq` rules `seq` new_prs `seq` + return init_pcs{ pcs_PRS = new_prs, + pcs_rules = rules } + else return pcs_tc +-} + +-- Should we remove bits of flat_result at this point? +-- ; flat_result <- case flat_result of +-- ModResult { md_binds = binds } -> +-- return ModDetails { md_binds = binds, +-- md_rules = [], +-- md_types = emptyTypeEnv, +-- md_insts = [] } + + -- alive at this point: + -- pcs_middle + -- flat_result + ------------------- - -- RENAME + -- SIMPLIFY ------------------- - ; (pcs_rn, print_unqualified, maybe_rn_result) - <- _scc_ "Rename" - renameModule dflags hit hst pcs_ch this_mod rdr_module - ; case maybe_rn_result of { - Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); - Just (is_exported, new_iface, rn_hs_decls) -> do { - - -- 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. - -- - -- isGlobalName separates the user-defined top-level names from those - -- introduced by the type checker. - ; let dont_discard | ghci_mode == Interactive = isGlobalName - | otherwise = is_exported + ; simpl_result <- _scc_ "Core2Core" + core2core hsc_env pcs_middle flat_result ------------------- - -- TYPECHECK + -- TIDY ------------------- - ; maybe_tc_result - <- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface - print_unqualified rn_hs_decls - ; case maybe_tc_result of { - Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); - Just (pcs_tc, tc_result) -> do { - - ; let env_tc = tc_env tc_result + ; cg_info_ref <- newIORef Nothing ; + ; let cg_info :: CgInfoEnv + cg_info = unsafePerformIO $ do { + maybe_cg_env <- readIORef cg_info_ref ; + case maybe_cg_env of + Just env -> return env + Nothing -> do { printError "Urk! Looked at CgInfo too early!"; + return emptyNameEnv } } + -- cg_info_ref will be filled in just after restOfCodeGeneration + -- Meanwhile, tidyCorePgm is careful not to look at cg_info! + + ; (pcs_simpl, tidy_result) + <- _scc_ "CoreTidy" + tidyCorePgm dflags pcs_middle cg_info simpl_result + +-- Space-saving ploy doesn't work so well now +-- because mkIface needs the populated PIT to +-- generate usage info. Maybe we should re-visit this. +-- ; pcs_final <- if one_shot then initPersistentCompilerState +-- else return pcs_simpl + ; let pcs_final = pcs_simpl + + -- Alive at this point: + -- tidy_result, pcs_final ------------------- - -- DESUGAR + -- PREPARE FOR CODE GENERATION + -- Do saturation and convert to A-normal form + ; prepd_result <- _scc_ "CorePrep" + corePrepPgm dflags tidy_result + + ------------------- + -- CONVERT TO STG and COMPLETE CODE GENERATION + ; (stub_h_exists, stub_c_exists, maybe_bcos) + <- hscBackEnd dflags cg_info_ref prepd_result + + ------------------- + -- BUILD THE NEW ModIface and ModDetails + -- and emit external core if necessary + -- This has to happen *after* code gen so that the back-end + -- info has been set. Not yet clear if it matters waiting + -- until after code output + ; final_iface <- _scc_ "MkFinalIface" + mkIface hsc_env location + maybe_checked_iface tidy_result + ; let final_details = ModDetails { md_types = mg_types tidy_result, + md_insts = mg_insts tidy_result, + md_rules = mg_rules tidy_result } + ; emitExternalCore dflags tidy_result + + -- and the answer is ... + ; return (HscRecomp pcs_final + final_details + final_iface + stub_h_exists stub_c_exists + maybe_bcos) + }} + +hscCoreFrontEnd hsc_env pcs_ch location = do { + ------------------- + -- PARSE + ------------------- + ; inp <- readFile (expectJust "hscCoreFrontEnd:hspp" (ml_hspp_file location)) + ; case parseCore inp 1 of + FailP s -> hPutStrLn stderr s >> return (Left (HscFail pcs_ch)); + OkP rdr_module -> do { + ------------------- - ; (ds_binds, ds_rules, foreign_stuff) - <- _scc_ "DeSugar" - deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + -- RENAME and TYPECHECK + ------------------- + ; (pcs_tc, maybe_tc_result) <- _scc_ "TypeCheck" + tcRnExtCore hsc_env pcs_ch rdr_module + ; case maybe_tc_result of { + Nothing -> return (Left (HscFail pcs_tc)); + Just mod_guts -> return (Right (pcs_tc, mod_guts)) + -- No desugaring to do! + }}} + +hscFrontEnd hsc_env pcs_ch location = do { ------------------- - -- SIMPLIFY, TIDY-CORE + -- PARSE ------------------- - -- We grab the the unfoldings at this point. - ; (pcs_simpl, tidy_binds, orphan_rules) - <- simplThenTidy dflags pcs_tc hst this_mod dont_discard ds_binds ds_rules - + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) + (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) + + ; case maybe_parsed of { + Nothing -> return (Left (HscFail pcs_ch)); + Just rdr_module -> do { + ------------------- - -- BUILD THE NEW ModDetails AND ModIface + -- RENAME and TYPECHECK ------------------- - ; let new_details = mkModDetails env_tc tidy_binds orphan_rules - ; final_iface <- _scc_ "MkFinalIface" - mkFinalIface ghci_mode dflags location - maybe_checked_iface new_iface new_details + ; (pcs_tc, maybe_tc_result) <- _scc_ "Typecheck and Rename" + tcRnModule hsc_env pcs_ch rdr_module + ; case maybe_tc_result of { + Nothing -> return (Left (HscFail pcs_ch)); + Just tc_result -> do { ------------------- - -- CONVERT TO STG and COMPLETE CODE GENERATION + -- DESUGAR ------------------- - -- Do saturation and convert to A-normal form - ; saturated <- coreSatPgm dflags tidy_binds + ; ds_result <- _scc_ "DeSugar" + deSugar hsc_env pcs_tc tc_result + ; return (Right (pcs_tc, ds_result)) + }}}}} - ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_bcos) - <- restOfCodeGeneration dflags toInterp this_mod - (map ideclName (hsModuleImports rdr_module)) - foreign_stuff env_tc saturated - hit (pcs_PIT pcs_simpl) - -- and the answer is ... - ; return (HscRecomp pcs_simpl new_details final_iface - maybe_stub_h_filename maybe_stub_c_filename - maybe_bcos) - }}}}}}} - - - -mkFinalIface ghci_mode dflags location maybe_old_iface new_iface new_details - = case completeIface maybe_old_iface new_iface new_details of - (new_iface, Nothing) -- no change in the interfacfe - -> do when (dopt Opt_D_dump_hi_diffs dflags) - (printDump (text "INTERFACE UNCHANGED")) - dumpIfSet_dyn dflags Opt_D_dump_hi - "UNCHANGED FINAL INTERFACE" (pprIface new_iface) - return new_iface - (new_iface, Just sdoc_diffs) - -> do dumpIfSet_dyn dflags Opt_D_dump_hi_diffs "INTERFACE HAS CHANGED" - sdoc_diffs - dumpIfSet_dyn dflags Opt_D_dump_hi "NEW FINAL INTERFACE" - (pprIface new_iface) - -- Write the interface file - when (ghci_mode /= Interactive) - (writeIface (unJust "hscRecomp:hi" (ml_hi_file location)) - new_iface) - return new_iface +hscBackEnd dflags cg_info_ref prepd_result + = case dopt_HscLang dflags of + HscNothing -> return (False, False, Nothing) + + HscInterpreted -> +#ifdef GHCI + do ----------------- Generate byte code ------------------ + comp_bc <- byteCodeGen dflags prepd_result + + -- Fill in the code-gen info + writeIORef cg_info_ref (Just emptyNameEnv) + + ------------------ Create f-x-dynamic C-side stuff --- + (istub_h_exists, istub_c_exists) + <- outputForeignStubs dflags (mg_foreign prepd_result) + + return ( istub_h_exists, istub_c_exists, + Just comp_bc ) +#else + panic "GHC not compiled with interpreter" +#endif + + other -> + do + ----------------- Convert to STG ------------------ + (stg_binds, cost_centre_info, stg_back_end_info) + <- _scc_ "CoreToStg" + myCoreToStg dflags prepd_result + + -- Fill in the code-gen info for the earlier tidyCorePgm + writeIORef cg_info_ref (Just stg_back_end_info) + + ------------------ Code generation ------------------ + abstractC <- _scc_ "CodeGen" + codeGen dflags prepd_result + cost_centre_info stg_binds + + ------------------ Code output ----------------------- + (stub_h_exists, stub_c_exists) + <- codeOutput dflags prepd_result abstractC + + return (stub_h_exists, stub_c_exists, Nothing) myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" _scc_ "Parser" do + buf <- hGetStringBuffer src_filename - buf <- hGetStringBuffer True{-expand tabs-} src_filename + let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags, + ffiEF = dopt Opt_FFI dflags, + withEF = dopt Opt_With dflags, + parrEF = dopt Opt_PArr dflags} + loc = mkSrcLoc (mkFastString src_filename) 1 - let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# - - case parseModule buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc (_PK_ src_filename) 1 } of { + case parseModule buf (mkPState loc exts) of { PFailed err -> do { hPutStrLn stderr (showSDoc err); freeStringBuffer buf; return Nothing }; - POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { + POk _ rdr_module -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -320,84 +429,30 @@ myParseModule dflags src_filename }} -simplThenTidy dflags pcs hst this_mod dont_discard binds rules - = do -- Do main Core-language transformations --------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) - <- core2core dflags pcs hst dont_discard binds rules - - -- Do the final tidy-up - (pcs', tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod pcs simplified orphan_rules - - return (pcs', tidy_binds, tidy_orphan_rules) - - -restOfCodeGeneration dflags toInterp this_mod imported_module_names - foreign_stuff env_tc tidy_binds - hit pit -- these last two for mapping ModNames to Modules - | toInterp - = do (bcos,itbl_env) - <- byteCodeGen dflags tidy_binds local_tycons local_classes - return (Nothing, Nothing, Just (bcos,itbl_env)) - - | otherwise - = do - -------------------------- Convert to STG ------------------------------- - (stg_binds, cost_centre_info) - <- _scc_ "CoreToStg" - myCoreToStg dflags this_mod tidy_binds env_tc - - -------------------------- Code generation ------------------------------ - abstractC <- _scc_ "CodeGen" - codeGen dflags this_mod imported_modules - cost_centre_info fe_binders - local_tycons stg_binds - - -------------------------- Code output ------------------------------- - (maybe_stub_h_name, maybe_stub_c_name) - <- codeOutput dflags this_mod local_tycons - tidy_binds stg_binds - c_code h_code abstractC - - return (maybe_stub_h_name, maybe_stub_c_name, Nothing) - where - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc - imported_modules = map mod_name_to_Module imported_module_names - (h_code,c_code,fe_binders) = foreign_stuff - - mod_name_to_Module :: ModuleName -> Module - mod_name_to_Module nm - = let str_mi = case lookupModuleEnvByName hit nm of - Just mi -> mi - Nothing -> case lookupModuleEnvByName pit nm of - Just mi -> mi - Nothing -> barf nm - in mi_module str_mi - barf nm = pprPanic "mod_name_to_Module: no hst or pst mapping for" - (ppr nm) - - -myCoreToStg dflags this_mod tidy_binds env_tc +myCoreToStg dflags (ModGuts {mg_module = this_mod, mg_binds = tidy_binds}) = do () <- coreBindsSize tidy_binds `seq` return () -- TEMP: the above call zaps some space usage allocated by the -- simplifier, which for reasons I don't understand, persists - -- thoroughout code generation + -- thoroughout code generation -- JRS + -- + -- This is still necessary. -- SDM (10 Dec 2001) - --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes + stg_binds <- _scc_ "Core2Stg" + coreToStg dflags tidy_binds - - stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds + (stg_binds2, cost_centre_info) <- _scc_ "Core2Stg" + stg2stg dflags this_mod stg_binds - (stg_binds2, cost_centre_info) - <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds + let env_rhs :: CgInfoEnv + env_rhs = mkNameEnv [ caf_info `seq` (idName bndr, CgInfo caf_info) + | (bind,_) <- stg_binds2, + let caf_info + | stgBindHasCafRefs bind = MayHaveCafRefs + | otherwise = NoCafRefs, + bndr <- stgBinders bind ] - return (stg_binds2, cost_centre_info) - where - local_tycons = typeEnvTyCons env_tc - local_classes = typeEnvClasses env_tc + return (stg_binds2, cost_centre_info, env_rhs) \end{code} @@ -407,21 +462,6 @@ myCoreToStg dflags this_mod tidy_binds env_tc %* * %************************************************************************ -\begin{code} -#ifdef GHCI -hscStmt - :: DynFlags - -> HomeSymbolTable - -> HomeIfaceTable - -> PersistentCompilerState -- IN: persistent compiler state - -> InteractiveContext -- Context for compiling - -> String -- The statement - -> IO ( PersistentCompilerState, - Maybe (InteractiveContext, - [Id], - UnlinkedBCOExpr) ) -\end{code} - When the UnlinkedBCOExpr is linked you get an HValue of type IO [HValue] When you run it you get a list of HValues that should be @@ -449,82 +489,70 @@ A naked expression returns a singleton Name [it]. result not showable) ==> error \begin{code} -hscStmt dflags hst hit pcs0 icontext stmt - = let - InteractiveContext { - ic_rn_env = rn_env, - ic_type_env = type_env, - ic_module = this_mod } = icontext - in - do { maybe_stmt <- hscParseStmt dflags stmt - ; case maybe_stmt of - Nothing -> return (pcs0, Nothing) +#ifdef GHCI +hscStmt -- Compile a stmt all the way to an HValue, but don't run it + :: HscEnv + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The statement + -> IO ( PersistentCompilerState, + Maybe (InteractiveContext, [Name], HValue) ) + +hscStmt hsc_env pcs icontext stmt + = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt + ; case maybe_stmt of { + Nothing -> return (pcs, Nothing) ; Just parsed_stmt -> do { - -- Rename it - (pcs1, print_unqual, maybe_renamed_stmt) - <- renameStmt dflags hit hst pcs0 this_mod rn_env parsed_stmt - ; case maybe_renamed_stmt of - Nothing -> return (pcs0, Nothing) - Just (bound_names, rn_stmt) -> do { - - -- Typecheck it - maybe_tc_return <- typecheckStmt dflags pcs1 hst type_env - print_unqual this_mod bound_names rn_stmt - ; case maybe_tc_return of { - Nothing -> return (pcs0, Nothing) ; - Just (pcs2, tc_expr, bound_ids) -> do { - - -- Desugar it - ds_expr <- deSugarExpr dflags pcs2 hst this_mod print_unqual tc_expr - - -- Simplify it - ; simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr + -- Rename and typecheck it + (pcs1, maybe_tc_result) + <- tcRnStmt hsc_env pcs icontext parsed_stmt - -- Saturate it - ; sat_expr <- coreSatExpr dflags simpl_expr + ; case maybe_tc_result of { + Nothing -> return (pcs1, Nothing) ; + Just (new_ic, bound_names, tc_expr) -> do { - -- Convert to BCOs - ; bcos <- coreExprToBCOs dflags sat_expr - - ; let - -- make all the bound ids "constant" ids, now that - -- they're notionally top-level bindings. This is - -- important: otherwise when we come to compile an expression - -- using these ids later, the byte code generator will consider - -- the occurrences to be free rather than global. - constant_bound_ids = map constantizeId bound_ids - constantizeId id - = modifyIdInfo (`setFlavourInfo` makeConstantFlavour - (idFlavour id)) id - - new_rn_env = extendLocalRdrEnv rn_env - (map idName constant_bound_ids) - -- Extend the renamer-env from bound_ids, not bound_names, - -- because the latter may contain [it] when the former is empty - - new_type_env = extendNameEnvList type_env - [(getName id, AnId id) | id <- constant_bound_ids] - - new_icontext = icontext { ic_rn_env = new_rn_env, - ic_type_env = new_type_env } - ; return (pcs2, Just (new_icontext, bound_ids, bcos)) - }}}}} + -- Then desugar, code gen, and link it + ; hval <- compileExpr hsc_env pcs1 iNTERACTIVE + (ic_rn_gbl_env new_ic) + (ic_type_env new_ic) + tc_expr + + ; return (pcs1, Just (new_ic, bound_names, hval)) + }}}}} + +hscTcExpr -- Typecheck an expression (but don't run it) + :: HscEnv + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The expression + -> IO (PersistentCompilerState, Maybe Type) + +hscTcExpr hsc_env pcs icontext expr + = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) expr + ; case maybe_stmt of { + Just (ExprStmt expr _ _) + -> tcRnExpr hsc_env pcs icontext expr ; + Just other -> do { hPutStrLn stderr ("not an expression: `" ++ expr ++ "'") ; + return (pcs, Nothing) } ; + Nothing -> return (pcs, Nothing) } } +\end{code} +\begin{code} hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) hscParseStmt dflags str - = do -------------------------- Parser ---------------- - showPass dflags "Parser" - _scc_ "Parser" do + = do showPass dflags "Parser" + _scc_ "Parser" do buf <- stringToStringBuffer str - let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags, + ffiEF = dopt Opt_FFI dflags, + withEF = dopt Opt_With dflags, + parrEF = dopt Opt_PArr dflags} + loc = mkSrcLoc FSLIT("") 1 - case parseStmt buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc SLIT("") 0 } of { + case parseStmt buf (mkPState loc exts) of { PFailed err -> do { hPutStrLn stderr (showSDoc err); -- Not yet implemented in <4.11 freeStringBuffer buf; @@ -546,6 +574,112 @@ hscParseStmt dflags str %************************************************************************ %* * +\subsection{Getting information about an identifer} +%* * +%************************************************************************ + +\begin{code} +#ifdef GHCI +hscThing -- like hscStmt, but deals with a single identifier + :: HscEnv + -> PersistentCompilerState -- IN: persistent compiler state + -> InteractiveContext -- Context for compiling + -> String -- The identifier + -> IO ( PersistentCompilerState, + [TyThing] ) + +hscThing hsc_env pcs0 ic str + = do let dflags = hsc_dflags hsc_env + + maybe_rdr_name <- myParseIdentifier dflags str + case maybe_rdr_name of { + Nothing -> return (pcs0, []); + Just rdr_name -> do + + (pcs1, maybe_tc_result) <- + tcRnThing hsc_env pcs0 ic rdr_name + + case maybe_tc_result of { + Nothing -> return (pcs1, []) ; + Just things -> return (pcs1, things) + }} + +myParseIdentifier dflags str + = do buf <- stringToStringBuffer str + + let exts = ExtFlags {glasgowExtsEF = dopt Opt_GlasgowExts dflags, + ffiEF = dopt Opt_FFI dflags, + withEF = dopt Opt_With dflags, + parrEF = dopt Opt_PArr dflags} + loc = mkSrcLoc FSLIT("") 1 + + case parseIdentifier buf (mkPState loc exts) of + + PFailed err -> do { hPutStrLn stderr (showSDoc err); + freeStringBuffer buf; + return Nothing } + + POk _ rdr_name -> do { --should, but can't: freeStringBuffer buf; + return (Just rdr_name) } +#endif +\end{code} + +%************************************************************************ +%* * + Desugar, simplify, convert to bytecode, and link an expression +%* * +%************************************************************************ + +\begin{code} +#ifdef GHCI +compileExpr :: HscEnv + -> PersistentCompilerState + -> Module -> GlobalRdrEnv -> TypeEnv + -> TypecheckedHsExpr + -> IO HValue + +compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr + = do { let { dflags = hsc_dflags hsc_env ; + lint_on = dopt Opt_DoCoreLinting dflags } + + -- Desugar it + ; ds_expr <- deSugarExpr hsc_env pcs this_mod rdr_env type_env tc_expr + + -- Flatten it + ; flat_expr <- flattenExpr hsc_env pcs ds_expr + + -- Simplify it + ; simpl_expr <- simplifyExpr dflags flat_expr + + -- Tidy it (temporary, until coreSat does cloning) + ; tidy_expr <- tidyCoreExpr simpl_expr + + -- Prepare for codegen + ; prepd_expr <- corePrepExpr dflags tidy_expr + + -- Lint if necessary + -- ToDo: improve SrcLoc + ; if lint_on then + case lintUnfolding noSrcLoc [] prepd_expr of + Just err -> pprPanic "compileExpr" err + Nothing -> return () + else + return () + + -- Convert to BCOs + ; bcos <- coreExprToBCOs dflags prepd_expr + + -- link it + ; hval <- linkExpr hsc_env pcs bcos + + ; return hval + } +#endif +\end{code} + + +%************************************************************************ +%* * \subsection{Initial persistent state} %* * %************************************************************************ @@ -553,44 +687,44 @@ hscParseStmt dflags str \begin{code} initPersistentCompilerState :: IO PersistentCompilerState initPersistentCompilerState - = do prs <- initPersistentRenamerState + = do nc <- initNameCache return ( - PCS { pcs_PIT = emptyIfaceTable, - pcs_PTE = wiredInThingEnv, - pcs_insts = emptyInstEnv, - pcs_rules = emptyRuleBase, - pcs_PRS = prs - } - ) - -initPersistentRenamerState :: IO PersistentRenamerState + PCS { pcs_EPS = initExternalPackageState, + pcs_nc = nc }) + +initNameCache :: IO NameCache = do us <- mkSplitUniqSupply 'r' - return ( - PRS { prsOrig = NameSupply { nsUniqs = us, - nsNames = initOrigNames, - nsIPs = emptyFM }, - prsDecls = (emptyNameEnv, 0), - prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), - prsImpMods = emptyFM - } - ) - -initOrigNames :: FiniteMap (ModuleName,OccName) Name + return (NameCache { nsUniqs = us, + nsNames = initOrigNames, + nsIPs = emptyFM }) + +initExternalPackageState :: ExternalPackageState +initExternalPackageState + = EPS { + eps_decls = (emptyNameEnv, 0), + eps_insts = (emptyBag, 0), + eps_inst_gates = emptyNameSet, + eps_rules = foldr add_rule (emptyBag, 0) builtinRules, + + eps_PIT = emptyPackageIfaceTable, + eps_PTE = wiredInThingEnv, + eps_inst_env = emptyInstEnv, + eps_rule_base = emptyRuleBase } + + where + add_rule (name,rule) (rules, n_slurped) + = (gated_decl `consBag` rules, n_slurped) + where + gated_decl = (gate_fn, (mod, IfaceRuleOut rdr_name rule)) + mod = nameModule name + rdr_name = nameRdrName name + gate_fn vis_fn = vis_fn name -- Load the rule whenever name is visible + +initOrigNames :: OrigNameCache initOrigNames - = grab knownKeyNames `plusFM` grab (map getName wiredInThings) - where - grab names = foldl add emptyFM names - add env name - = addToFM env (moduleName (nameModule name), nameOccName name) name - - -initRules :: PackageRuleBase -initRules = emptyRuleBase -{- SHOULD BE (ish) - foldl add emptyVarEnv builtinRules - where - add env (name,rule) - = extendRuleBase env name rule --} + = insert knownKeyNames $ + insert (map getName wiredInThings) $ + emptyModuleEnv + where + insert names env = foldl extendOrigNameCache env names \end{code}