X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=6bb6d6f726d75b06bfbecd360adeff674aecb079;hb=a25955b5ac32b2a501c7278acb39cfeccd308a6f;hp=f256d083838cad7b41e1a50d79dc671b94a85617;hpb=c271b64780a6504e7ccd4cc422dfc90678ea966f;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index f256d08..6bb6d6f 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -4,24 +4,31 @@ \section[GHC_Main]{Main driver for Glasgow Haskell compiler} \begin{code} -module HscMain ( HscResult(..), hscMain, hscExpr, +module HscMain ( HscResult(..), hscMain, +#ifdef GHCI + hscExpr, +#endif initPersistentCompilerState ) where #include "HsVersions.h" #ifdef GHCI import RdrHsSyn ( RdrNameHsExpr ) -import CoreToStg ( coreToStgExpr ) -import StringBuffer ( stringToStringBuffer, freeStringBuffer ) +import Rename ( renameExpr ) +import Unique ( Uniquable(..) ) +import Type ( Type, splitTyConApp_maybe ) +import PrelNames ( ioTyConKey ) +import ByteCodeGen ( byteCodeGen ) #endif import HsSyn -import StringBuffer ( hGetStringBuffer ) +import StringBuffer ( hGetStringBuffer, + stringToStringBuffer, freeStringBuffer ) import Parser import Lex ( PState(..), ParseResult(..) ) import SrcLoc ( mkSrcLoc ) -import Rename +import Rename ( checkOldIface, renameModule, closeIfaceDecls ) import Rules ( emptyRuleBase ) import PrelInfo ( wiredInThingEnv, wiredInThings ) import PrelNames ( knownKeyNames ) @@ -31,16 +38,15 @@ import TcModule import InstEnv ( emptyInstEnv ) import Desugar import SimplCore -import OccurAnal ( occurAnalyseBinds ) import CoreUtils ( coreBindsSize ) import CoreTidy ( tidyCorePgm ) -import CoreToStg ( topCoreBindsToStg ) -import StgSyn ( collectFinalStgBinders ) +import CoreSat +import CoreToStg ( coreToStg ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) import CodeOutput ( codeOutput ) -import Module ( ModuleName, moduleName, mkModuleInThisPackage ) +import Module ( ModuleName, moduleName, mkHomeModule ) import CmdLineOpts import ErrUtils ( dumpIfSet_dyn, showPass ) import Util ( unJust ) @@ -48,23 +54,23 @@ import UniqSupply ( mkSplitUniqSupply ) import Bag ( emptyBag ) import Outputable -import Interpreter ( stgBindsToInterpSyn, UnlinkedIExpr, UnlinkedIBind, ItblEnv ) +import Interpreter import CmStaticInfo ( GhciMode(..) ) import HscStats ( ppSourceStats ) import HscTypes ( ModDetails, ModIface(..), PersistentCompilerState(..), PersistentRenamerState(..), ModuleLocation(..), HomeSymbolTable, - OrigNameEnv(..), PackageRuleBase, HomeIfaceTable, + NameSupply(..), PackageRuleBase, HomeIfaceTable, typeEnvClasses, typeEnvTyCons, emptyIfaceTable ) import FiniteMap ( FiniteMap, plusFM, emptyFM, addToFM ) import OccName ( OccName ) -import Name ( Name, nameModule, nameOccName, getName ) -import Name ( emptyNameEnv ) +import Name ( Name, nameModule, nameOccName, getName, isGlobalName, + emptyNameEnv ) import Module ( Module, lookupModuleEnvByName ) import Monad ( when ) import Maybe ( isJust ) -import IO ( hPutStrLn, stderr ) +import IO \end{code} @@ -76,14 +82,21 @@ import IO ( hPutStrLn, stderr ) \begin{code} data HscResult - = HscOK ModDetails -- new details (HomeSymbolTable additions) - (Maybe 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 ([UnlinkedIBind],ItblEnv)) -- interpreted code, if any - PersistentCompilerState -- updated PCS - - | HscFail PersistentCompilerState -- updated PCS + -- compilation failed + = HscFail PersistentCompilerState -- updated PCS + -- concluded that it wasn't necessary + | HscNoRecomp PersistentCompilerState -- updated PCS + ModDetails -- new details (HomeSymbolTable additions) + ModIface -- new iface (if any compilation was done) + -- did recompilation + | 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 + + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves @@ -105,7 +118,7 @@ hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs ++ ", hspp = " ++ show (ml_hspp_file location)); (pcs_ch, errs_found, (recomp_reqd, maybe_checked_iface)) - <- checkOldIface dflags hit hst pcs + <- checkOldIface ghci_mode dflags hit hst pcs (unJust "hscMain" (ml_hi_file location)) source_unchanged maybe_old_iface; @@ -125,16 +138,15 @@ hscMain ghci_mode dflags source_unchanged location maybe_old_iface hst hit pcs -- we definitely expect to have the old interface available hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch | ghci_mode == OneShot - = return (HscOK - (panic "hscNoRecomp:OneShot") -- no details - Nothing -- makes run_phase Hsc stop - Nothing Nothing -- foreign export stuff - Nothing -- ibinds - pcs_ch) + = do { + hPutStrLn stderr "compilation IS NOT required"; + let { bomb = panic "hscNoRecomp:OneShot" }; + return (HscNoRecomp pcs_ch bomb bomb) + } | otherwise = do { - hPutStrLn stderr "COMPILATION NOT REQUIRED"; - ; + hPutStrLn stderr "compilation IS NOT required"; + -- CLOSURE (pcs_cl, closure_errs, cl_hs_decls) <- closeIfaceDecls dflags hit hst pcs_ch old_iface ; @@ -144,29 +156,26 @@ hscNoRecomp ghci_mode dflags location (Just old_iface) hst hit pcs_ch -- TYPECHECK maybe_tc_result <- typecheckModule dflags pcs_cl hst - old_iface alwaysQualify cl_hs_decls; + old_iface alwaysQualify cl_hs_decls + False{-don't check for Main.main-}; case maybe_tc_result of { Nothing -> return (HscFail pcs_cl); Just (pcs_tc, tc_result) -> do { let env_tc = tc_env tc_result - local_insts = tc_insts tc_result local_rules = tc_rules tc_result ; -- create a new details from the closed, typechecked, old iface - let new_details = mkModDetailsFromIface env_tc local_insts local_rules + let new_details = mkModDetailsFromIface env_tc local_rules ; - return (HscOK new_details - Nothing -- tells CM to use old iface and linkables - Nothing Nothing -- foreign export stuff - Nothing -- ibinds - pcs_tc) + return (HscNoRecomp pcs_tc new_details old_iface) }}}} hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch = do { - ; hPutStrLn stderr "COMPILATION IS REQUIRED"; + ; when (verbosity dflags >= 1) $ + hPutStrLn stderr "compilation IS required"; -- what target are we shooting for? ; let toInterp = dopt_HscLang dflags == HscInterpreted @@ -179,68 +188,75 @@ hscRecomp ghci_mode dflags location maybe_checked_iface hst hit pcs_ch ; case maybe_parsed of { Nothing -> return (HscFail pcs_ch); Just rdr_module -> do { - ; let this_mod = mkModuleInThisPackage (hsModuleName rdr_module) + ; let this_mod = mkHomeModule (hsModuleName rdr_module) ------------------- -- RENAME ------------------- - ; showPass dflags "Rename" ; (pcs_rn, maybe_rn_result) - <- renameModule dflags hit hst pcs_ch this_mod rdr_module + <- _scc_ "Rename" + renameModule dflags hit hst pcs_ch this_mod rdr_module ; case maybe_rn_result of { - Nothing -> return (HscFail pcs_rn); + Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); Just (print_unqualified, (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 + ------------------- -- TYPECHECK ------------------- - ; showPass dflags "Typecheck" - ; maybe_tc_result <- typecheckModule dflags pcs_rn hst new_iface - print_unqualified rn_hs_decls + ; maybe_tc_result + <- _scc_ "TypeCheck" typecheckModule dflags pcs_rn hst new_iface + print_unqualified rn_hs_decls + True{-check for Main.main if necessary-} ; case maybe_tc_result of { - Nothing -> do { hPutStrLn stderr "Typecheck failed" - ; return (HscFail pcs_rn) } ; + Nothing -> return (HscFail pcs_ch{-was: pcs_rn-}); Just (pcs_tc, tc_result) -> do { - ; let env_tc = tc_env tc_result - local_insts = tc_insts tc_result + ; let env_tc = tc_env tc_result ------------------- - -- DESUGAR, SIMPLIFY, TIDY-CORE + -- DESUGAR ------------------- - -- We grab the the unfoldings at this point. - ; simpl_result <- dsThenSimplThenTidy dflags pcs_tc hst this_mod - print_unqualified is_exported tc_result - ; let (tidy_binds, orphan_rules, foreign_stuff) = simpl_result - + ; (ds_binds, ds_rules, foreign_stuff) + <- _scc_ "DeSugar" + deSugar dflags pcs_tc hst this_mod print_unqualified tc_result + ------------------- - -- CONVERT TO STG + -- SIMPLIFY, TIDY-CORE ------------------- - ; (stg_binds, oa_tidy_binds, cost_centre_info, top_level_ids) - <- myCoreToStg dflags this_mod tidy_binds - - + -- 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 + ------------------- -- BUILD THE NEW ModDetails AND ModIface ------------------- - ; let new_details = mkModDetails env_tc local_insts tidy_binds - top_level_ids orphan_rules - ; final_iface <- mkFinalIface ghci_mode dflags location + ; 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 ------------------- - -- COMPLETE CODE GENERATION + -- CONVERT TO STG and COMPLETE CODE GENERATION ------------------- - ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_ibinds) + ; (maybe_stub_h_filename, maybe_stub_c_filename, maybe_bcos) <- restOfCodeGeneration dflags toInterp this_mod (map ideclName (hsModuleImports rdr_module)) - cost_centre_info foreign_stuff env_tc stg_binds oa_tidy_binds - hit (pcs_PIT pcs_tc) + foreign_stuff env_tc tidy_binds + hit (pcs_PIT pcs_simpl) -- and the answer is ... - ; return (HscOK new_details (Just final_iface) - maybe_stub_h_filename maybe_stub_c_filename - maybe_ibinds pcs_tc) + ; return (HscRecomp pcs_simpl new_details final_iface + maybe_stub_h_filename maybe_stub_c_filename + maybe_bcos) }}}}}}} @@ -268,21 +284,22 @@ mkFinalIface ghci_mode dflags location maybe_old_iface new_iface new_details myParseModule dflags src_filename = do -------------------------- Parser ---------------- showPass dflags "Parser" - -- _scc_ "Parser" + _scc_ "Parser" do buf <- hGetStringBuffer True{-expand tabs-} src_filename let glaexts | dopt Opt_GlasgowExts dflags = 1# - | otherwise = 0# + | otherwise = 0# - case parse buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc (_PK_ src_filename) 1 } of { + case parseModule buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc (_PK_ src_filename) 1 } of { PFailed err -> do { hPutStrLn stderr (showSDoc err); + freeStringBuffer buf; return Nothing }; - POk _ (PModule rdr_module@(HsModule mod_name _ _ _ _ _ _)) -> do { + POk _ rdr_module@(HsModule mod_name _ _ _ _ _ _) -> do { dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_module) ; @@ -290,30 +307,52 @@ myParseModule dflags src_filename (ppSourceStats False rdr_module) ; return (Just rdr_module) + -- ToDo: free the string buffer later. }} -restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_info - foreign_stuff env_tc stg_binds oa_tidy_binds +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 saturation and convert to A-normal form + -- NOTE: subsequent passes may not transform the syntax, only annotate it + saturated <- coreSatPgm dflags simplified + + -- Do the final tidy-up + (pcs', tidy_binds, tidy_orphan_rules) + <- tidyCorePgm dflags this_mod pcs saturated 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 (ibinds,itbl_env) - <- stgBindsToInterpSyn dflags (map fst stg_binds) - local_tycons local_classes - return (Nothing, Nothing, Just (ibinds,itbl_env)) + = do (bcos,itbl_env) + <- byteCodeGen dflags tidy_binds local_tycons local_classes + return (Nothing, Nothing, Just (bcos,itbl_env)) | otherwise - = do -------------------------- Code generation ------------------------------- - -- _scc_ "CodeGen" - abstractC <- codeGen dflags this_mod imported_modules + = 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 ------------------------------- - -- _scc_ "CodeOutput" (maybe_stub_h_name, maybe_stub_c_name) <- codeOutput dflags this_mod local_tycons - oa_tidy_binds stg_binds + tidy_binds stg_binds c_code h_code abstractC return (maybe_stub_h_name, maybe_stub_c_name, Nothing) @@ -321,7 +360,7 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ local_tycons = typeEnvTyCons env_tc local_classes = typeEnvClasses env_tc imported_modules = map mod_name_to_Module imported_module_names - (fe_binders,h_code,c_code) = foreign_stuff + (h_code,c_code,fe_binders) = foreign_stuff mod_name_to_Module :: ModuleName -> Module mod_name_to_Module nm @@ -335,45 +374,25 @@ restOfCodeGeneration dflags toInterp this_mod imported_module_names cost_centre_ (ppr nm) -dsThenSimplThenTidy dflags pcs hst this_mod print_unqual is_exported tc_result - = do -------------------------- Desugaring ---------------- - showPass dflags "DeSugar" - -- _scc_ "DeSugar" - (desugared, rules, h_code, c_code, fe_binders) - <- deSugar dflags pcs hst this_mod print_unqual tc_result - - -------------------------- Main Core-language transformations ---------------- - -- _scc_ "Core2Core" - (simplified, orphan_rules) - <- core2core dflags pcs hst is_exported desugared rules - - -- Do the final tidy-up - showPass dflags "TidyCore" - (tidy_binds, tidy_orphan_rules) - <- tidyCorePgm dflags this_mod simplified orphan_rules - - return (tidy_binds, tidy_orphan_rules, (fe_binders,h_code,c_code)) - - -myCoreToStg dflags this_mod tidy_binds +myCoreToStg dflags this_mod tidy_binds env_tc = do - st_uniqs <- mkSplitUniqSupply 'g' - let occ_anal_tidy_binds = occurAnalyseBinds tidy_binds - - () <- coreBindsSize occ_anal_tidy_binds `seq` return () + () <- 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 - -- _scc_ "Core2Stg" - stg_binds <- topCoreBindsToStg dflags occ_anal_tidy_binds + --let bcos = byteCodeGen dflags tidy_binds local_tycons local_classes + + + stg_binds <- _scc_ "Core2Stg" coreToStg dflags this_mod tidy_binds - showPass dflags "Stg2Stg" - -- _scc_ "Stg2Stg" - (stg_binds2, cost_centre_info) <- stg2stg dflags this_mod st_uniqs stg_binds - let final_ids = collectFinalStgBinders (map fst stg_binds2) + (stg_binds2, cost_centre_info) + <- _scc_ "Core2Stg" stg2stg dflags this_mod stg_binds - return (stg_binds2, occ_anal_tidy_binds, cost_centre_info, final_ids) + return (stg_binds2, cost_centre_info) + where + local_tycons = typeEnvTyCons env_tc + local_classes = typeEnvClasses env_tc \end{code} @@ -384,22 +403,20 @@ myCoreToStg dflags this_mod tidy_binds %************************************************************************ \begin{code} +#ifdef GHCI hscExpr :: DynFlags + -> Bool -- True <=> wrap in 'print' to get a result of IO type -> HomeSymbolTable -> HomeIfaceTable -> PersistentCompilerState -- IN: persistent compiler state -> Module -- Context for compiling -> String -- The expression - -> IO ( PersistentCompilerState, Maybe UnlinkedIExpr ) - -#ifndef GHCI -hscExpr dflags hst hit pcs this_module expr - = panic "hscExpr: non-interactive build" -#else + -> IO ( PersistentCompilerState, + Maybe (UnlinkedBCOExpr, PrintUnqualified, Type) ) -hscExpr dflags hst hit pcs0 this_module expr - = do { -- Parse it +hscExpr dflags wrap_io hst hit pcs0 this_module expr + = do { maybe_parsed <- hscParseExpr dflags expr; case maybe_parsed of Nothing -> return (pcs0, Nothing) @@ -409,62 +426,59 @@ hscExpr dflags hst hit pcs0 this_module expr (pcs1, maybe_renamed_expr) <- renameExpr dflags hit hst pcs0 this_module parsed_expr; case maybe_renamed_expr of - Nothing -> return (pcs1, Nothing) + Nothing -> return ({-WAS:pcs1-} pcs0, Nothing) Just (print_unqual, rn_expr) -> do { -- Typecheck it - maybe_tc_expr <- typecheckExpr dflags pcs1 hst print_unqual this_module rn_expr; - case maybe_tc_expr of - Nothing -> return (pcs1, Nothing) - Just tc_expr -> do { + maybe_tc_return + <- typecheckExpr dflags wrap_io pcs1 hst print_unqual this_module rn_expr; + case maybe_tc_return of { + Nothing -> return ({-WAS:pcs1-} pcs0, Nothing); + Just (pcs2, tc_expr, ty) -> do -- Desugar it - ds_expr <- deSugarExpr dflags pcs1 hst this_module + ds_expr <- deSugarExpr dflags pcs2 hst this_module print_unqual tc_expr; -- Simplify it - simpl_expr <- simplifyExpr dflags pcs1 hst ds_expr; + simpl_expr <- simplifyExpr dflags pcs2 hst ds_expr; - -- Convert to STG - stg_expr <- coreToStgExpr dflags simpl_expr; + -- Saturate it + sat_expr <- coreSatExpr dflags simpl_expr; - -- ToDo: need to do StgVarInfo? or SRTs? + -- ToDo: need to do SRTs? - -- Convert to InterpSyn - unlinked_iexpr <- stgExprToInterpSyn dflags stg_expr; + -- Convert to BCOs + bcos <- coreExprToBCOs dflags sat_expr - return (pcs1, Just unlinked_iexpr); + return (pcs2, Just (bcos, print_unqual, ty)); }}}} hscParseExpr :: DynFlags -> String -> IO (Maybe RdrNameHsExpr) hscParseExpr dflags str = do -------------------------- Parser ---------------- showPass dflags "Parser" - -- _scc_ "Parser" + _scc_ "Parser" do - buf <- stringToStringBuffer ("__expr " ++ str) + buf <- stringToStringBuffer str - -- glaexts is True for now (because of the daft __expr at the front - -- of the string...) - let glaexts = 1# - --let glaexts | dopt Opt_GlasgowExts dflags = 1# - -- | otherwise = 0# - - case parse buf PState{ bol = 0#, atbol = 1#, - context = [], glasgow_exts = glaexts, - loc = mkSrcLoc SLIT("") 0 } of { + let glaexts | dopt Opt_GlasgowExts dflags = 1# + | otherwise = 0# - PFailed err -> do { freeStringBuffer buf - ; hPutStrLn stderr (showSDoc err) - ; return Nothing }; + case parseExpr buf PState{ bol = 0#, atbol = 1#, + context = [], glasgow_exts = glaexts, + loc = mkSrcLoc SLIT("") 0 } of { - POk _ (PExpr rdr_expr) -> do { + PFailed err -> do { hPutStrLn stderr (showSDoc err); +-- Not yet implemented in <4.11 freeStringBuffer buf; + return Nothing }; - -- ToDo: - -- freeStringBuffer buf; + POk _ rdr_expr -> do { + --ToDo: can't free the string buffer until we've finished this + -- compilation sweep and all the identifiers have gone away. + --freeStringBuffer buf; dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr rdr_expr); - return (Just rdr_expr) }} #endif @@ -490,14 +504,15 @@ initPersistentCompilerState ) initPersistentRenamerState :: IO PersistentRenamerState - = do ns <- mkSplitUniqSupply 'r' + = do us <- mkSplitUniqSupply 'r' return ( - PRS { prsOrig = Orig { origNames = initOrigNames, - origIParam = emptyFM }, - prsDecls = (emptyNameEnv, 0), - prsInsts = (emptyBag, 0), - prsRules = (emptyBag, 0), - prsNS = ns + PRS { prsOrig = NameSupply { nsUniqs = us, + nsNames = initOrigNames, + nsIPs = emptyFM }, + prsDecls = (emptyNameEnv, 0), + prsInsts = (emptyBag, 0), + prsRules = (emptyBag, 0), + prsImpMods = emptyFM } )