X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=7b3e84b502a2ed39232b466636d629f0c79507e5;hb=c5baccd2b0fc8b987f6c9145a68f06f1d73036bb;hp=c53287172a99233fcbe11d2a20748e68c0ef240d;hpb=b708d7d804d96a80d014f8986c7d808211dac64c;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index c532871..7b3e84b 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -6,9 +6,12 @@ \begin{code} module HscMain ( - HscResult(..), hscMain, initPersistentCompilerState + HscResult(..), + hscMain, newHscEnv, hscCmmFile, + hscBufferCheck, hscFileCheck, #ifdef GHCI - , hscStmt, hscTcExpr, hscThing, + , hscStmt, hscTcExpr, hscKcType + , hscGetInfo, GetInfoResult , compileExpr #endif ) where @@ -16,272 +19,354 @@ module HscMain ( #include "HsVersions.h" #ifdef GHCI -import TcHsSyn ( TypecheckedHsExpr ) +import HsSyn ( Stmt(..), LStmt, LHsExpr, LHsType ) +import IfaceSyn ( IfaceDecl, IfaceInst ) +import Module ( Module ) 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 TcRnDriver ( tcRnStmt, tcRnExpr, tcRnGetInfo, tcRnType ) +import RdrName ( rdrNameOcc ) +import OccName ( occNameUserString ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import StringBuffer ( stringToStringBuffer ) -import Name ( Name ) +import Kind ( Kind ) +import Var ( Id ) import CoreLint ( lintUnfolding ) +import DsMeta ( templateHaskellNames ) +import BasicTypes ( Fixity ) +import SrcLoc ( SrcLoc, noSrcLoc ) #endif -import HsSyn - -import RdrName ( nameRdrName ) -import Id ( idName ) -import IdInfo ( CafInfo(..), CgInfoEnv, CgInfo(..) ) -import StringBuffer ( hGetStringBuffer, freeStringBuffer ) +import RdrName ( RdrName ) +import HsSyn ( HsModule ) +import SrcLoc ( Located(..) ) +import StringBuffer ( hGetStringBuffer ) import Parser -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, knownKeyNames ) -import PrelRules ( builtinRules ) -import MkIface ( mkIface ) -import InstEnv ( emptyInstEnv ) +import Lexer ( P(..), ParseResult(..), mkPState ) +import SrcLoc ( mkSrcLoc ) +import TcRnDriver ( tcRnModule, tcRnExtCore ) +import TcRnTypes ( TcGblEnv ) +import TcIface ( typecheckIface ) +import IfaceEnv ( initNameCache ) +import LoadIface ( ifaceStats, initExternalPackageState ) +import PrelInfo ( wiredInThings, basicKnownKeyNames ) +import RdrName ( GlobalRdrEnv ) +import MkIface ( checkOldIface, mkIface ) import Desugar import Flattening ( flatten ) import SimplCore -import CoreUtils ( coreBindsSize ) import TidyPgm ( tidyCorePgm ) import CorePrep ( corePrepPgm ) -import StgSyn import CoreToStg ( coreToStg ) +import Name ( Name, NamedThing(..) ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) +import CmmParse ( parseCmmFile ) import CodeOutput ( codeOutput ) -import Module ( emptyModuleEnv ) import CmdLineOpts -import DriverPhases ( isExtCore_file ) -import ErrUtils ( dumpIfSet_dyn, showPass, printError ) +import DriverPhases ( HscSource(..) ) +import ErrUtils import UniqSupply ( mkSplitUniqSupply ) -import Bag ( consBag, emptyBag ) import Outputable import HscStats ( ppSourceStats ) 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 StringBuffer ( StringBuffer ) +import Bag ( unitBag, emptyBag ) import Monad ( when ) -import Maybe ( isJust, fromJust ) +import Maybe ( isJust ) import IO +import DATA_IOREF ( newIORef, readIORef ) \end{code} %************************************************************************ %* * -\subsection{The main compiler pipeline} + Initialisation +%* * +%************************************************************************ + +\begin{code} +newHscEnv :: GhciMode -> DynFlags -> IO HscEnv +newHscEnv ghci_mode dflags + = do { eps_var <- newIORef initExternalPackageState + ; us <- mkSplitUniqSupply 'r' + ; nc_var <- newIORef (initNameCache us knownKeyNames) + ; return (HscEnv { hsc_mode = ghci_mode, + hsc_dflags = dflags, + hsc_HPT = emptyHomePackageTable, + hsc_EPS = eps_var, + hsc_NC = nc_var } ) } + + +knownKeyNames :: [Name] -- Put here to avoid loops involving DsMeta, + -- where templateHaskellNames are defined +knownKeyNames = map getName wiredInThings + ++ basicKnownKeyNames +#ifdef GHCI + ++ templateHaskellNames +#endif +\end{code} + + +%************************************************************************ +%* * + The main compiler pipeline %* * %************************************************************************ \begin{code} data HscResult - -- compilation failed - = HscFail PersistentCompilerState -- updated PCS - -- concluded that it wasn't necessary - | HscNoRecomp PersistentCompilerState -- updated PCS - ModDetails -- new details (HomeSymbolTable additions) + -- Compilation failed + = HscFail + + -- In IDE mode: we just do the static/dynamic checks + | HscChecked (Located (HsModule RdrName)) (Maybe TcGblEnv) + + -- Concluded that it wasn't necessary + | HscNoRecomp 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) + + -- Did recompilation + | HscRecomp ModDetails -- new details (HomeSymbolTable additions) + ModIface -- new iface (if any compilation was done) Bool -- stub_h exists Bool -- stub_c exists (Maybe CompiledByteCode) + +-- What to do when we have compiler error or warning messages +type MessageAction = Messages -> IO () + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain :: HscEnv - -> PersistentCompilerState -- IN: persistent compiler state - -> Module - -> ModLocation -- location info - -> Bool -- True <=> source unchanged - -> Bool -- True <=> have an object file (for msgs only) - -> Maybe ModIface -- old interface, if available + -> MessageAction -- What to do with errors/warnings + -> ModSummary + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) + -> Maybe ModIface -- Old interface, if available -> IO HscResult -hscMain hsc_env pcs mod location +hscMain hsc_env msg_act mod_summary source_unchanged have_object maybe_old_iface = 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 { + (recomp_reqd, maybe_checked_iface) <- + _scc_ "checkOldIface" + checkOldIface hsc_env mod_summary + source_unchanged maybe_old_iface; let no_old_iface = not (isJust maybe_checked_iface) what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; what_next hsc_env pcs_ch have_object - mod location maybe_checked_iface - }}} + ; what_next hsc_env msg_act mod_summary have_object + maybe_checked_iface + } +------------------------------ -- 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 +hscNoRecomp hsc_env msg_act mod_summary + have_object (Just old_iface) + | isOneShot (hsc_mode hsc_env) = do { - when (verbosity (hsc_dflags hsc_env) > 0) $ - hPutStrLn stderr "compilation IS NOT required"; + compilationProgressMsg (hsc_dflags hsc_env) $ + "compilation IS NOT required"; + dumpIfaceStats hsc_env ; + let { bomb = panic "hscNoRecomp:OneShot" }; - return (HscNoRecomp pcs_ch bomb bomb) + return (HscNoRecomp bomb bomb) } | otherwise - = do { - when (verbosity (hsc_dflags hsc_env) >= 1) $ - hPutStrLn stderr ("Skipping " ++ - showModMsg have_object mod location); + = do { compilationProgressMsg (hsc_dflags hsc_env) $ + ("Skipping " ++ showModMsg have_object mod_summary) - -- Typecheck - (pcs_tc, maybe_tc_result) <- tcRnIface hsc_env pcs_ch old_iface ; + ; new_details <- _scc_ "tcRnIface" + typecheckIface hsc_env old_iface ; + ; dumpIfaceStats hsc_env - case maybe_tc_result of { - Nothing -> return (HscFail pcs_tc); - Just new_details -> + ; return (HscNoRecomp new_details old_iface) + } - return (HscNoRecomp pcs_tc new_details old_iface) - }} +------------------------------ +hscRecomp hsc_env msg_act mod_summary + have_object maybe_checked_iface + = case ms_hsc_src mod_summary of + HsSrcFile -> do { front_res <- hscFileFrontEnd hsc_env msg_act mod_summary + ; hscBackEnd hsc_env mod_summary maybe_checked_iface front_res } -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)) + HsBootFile -> do { front_res <- hscFileFrontEnd hsc_env msg_act mod_summary + ; hscBootBackEnd hsc_env mod_summary maybe_checked_iface front_res } + + ExtCoreFile -> do { front_res <- hscCoreFrontEnd hsc_env msg_act mod_summary + ; hscBackEnd hsc_env mod_summary maybe_checked_iface front_res } + +hscCoreFrontEnd hsc_env msg_act mod_summary = do { + ------------------- + -- PARSE + ------------------- + ; inp <- readFile (expectJust "hscCoreFrontEnd" (ms_hspp_file mod_summary)) + ; case parseCore inp 1 of + FailP s -> putMsg s{-ToDo: wrong-} >> return Nothing + OkP rdr_module -> do { + + ------------------- + -- RENAME and TYPECHECK + ------------------- + ; (tc_msgs, maybe_tc_result) <- _scc_ "TypeCheck" + tcRnExtCore hsc_env rdr_module + ; msg_act tc_msgs + ; case maybe_tc_result of + Nothing -> return Nothing + Just mod_guts -> return (Just mod_guts) -- No desugaring to do! + }} + - ; when (not one_shot && verbosity dflags >= 1) $ - hPutStrLn stderr ("Compiling " ++ - showModMsg (not toInterp) mod location); +hscFileFrontEnd hsc_env msg_act mod_summary = do { + ------------------- + -- DISPLAY PROGRESS MESSAGE + ------------------- + let one_shot = isOneShot (hsc_mode hsc_env) + ; let dflags = hsc_dflags hsc_env + ; let toInterp = dopt_HscTarget dflags == HscInterpreted + ; when (not one_shot) $ + compilationProgressMsg dflags $ + ("Compiling " ++ showModMsg (not toInterp) mod_summary) - ; front_res <- if toCore then - hscCoreFrontEnd hsc_env pcs_ch location - else - hscFrontEnd hsc_env pcs_ch location + ------------------- + -- PARSE + ------------------- + ; let hspp_file = expectJust "hscFileFrontEnd" (ms_hspp_file mod_summary) + hspp_buf = ms_hspp_buf mod_summary + + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file hspp_buf - ; case front_res of - Left flure -> return flure; - Right (pcs_tc, ds_result) -> do { + ; case maybe_parsed of { + Left err -> do { msg_act (unitBag err, emptyBag) + ; return Nothing } ; + Right rdr_module -> do { + ------------------- + -- RENAME and TYPECHECK + ------------------- + (tc_msgs, maybe_tc_result) + <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env (ms_hsc_src mod_summary) rdr_module - -- OMITTED: - -- ; seqList imported_modules (return ()) + ; msg_act tc_msgs + ; case maybe_tc_result of { + Nothing -> return Nothing ; + Just tc_result -> do { + + ------------------- + -- DESUGAR + ------------------- + ; (warns, maybe_ds_result) <- _scc_ "DeSugar" + deSugar hsc_env tc_result + ; msg_act (warns, emptyBag) + ; case maybe_ds_result of + Nothing -> return Nothing + Just ds_result -> return (Just ds_result) + }}}}} + +------------------------------ +hscBootBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult +-- For hs-boot files, there's no code generation to do + +hscBootBackEnd hsc_env mod_summary maybe_checked_iface Nothing + = return HscFail +hscBootBackEnd hsc_env mod_summary maybe_checked_iface (Just ds_result) + = do { final_iface <- _scc_ "MkFinalIface" + mkIface hsc_env (ms_location mod_summary) + maybe_checked_iface ds_result + + ; let { final_details = ModDetails { md_types = mg_types ds_result, + md_insts = mg_insts ds_result, + md_rules = mg_rules ds_result } } + -- And the answer is ... + ; dumpIfaceStats hsc_env + + ; return (HscRecomp final_details + final_iface + False False Nothing) + } + +------------------------------ +hscBackEnd :: HscEnv -> ModSummary -> Maybe ModIface -> Maybe ModGuts -> IO HscResult + +hscBackEnd hsc_env mod_summary maybe_checked_iface Nothing + = return HscFail + +hscBackEnd hsc_env mod_summary maybe_checked_iface (Just ds_result) + = do { -- OMITTED: + -- ; seqList imported_modules (return ()) + + let one_shot = isOneShot (hsc_mode hsc_env) + dflags = hsc_dflags hsc_env ------------------- -- FLATTENING ------------------- ; 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 --} + flatten hsc_env ds_result + --- 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 = [] } +{- TEMP: need to review space-leak fixing here + NB: even the code generator can force one of the + thunks for constructor arguments, for newtypes in particular + + ; let -- Rule-base accumulated from imported packages + pkg_rule_base = eps_rule_base (hsc_EPS hsc_env) + + -- In one-shot mode, ZAP the external package state at + -- this point, because we aren't going to need it from + -- now on. We keep the name cache, however, because + -- tidyCore needs it. + pcs_middle + | one_shot = pcs_tc{ pcs_EPS = error "pcs_EPS missing" } + | otherwise = pcs_tc + + ; pkg_rule_base `seq` pcs_middle `seq` return () +-} -- alive at this point: -- pcs_middle -- flat_result + -- pkg_rule_base ------------------- -- SIMPLIFY ------------------- - ; simpl_result <- _scc_ "Core2Core" - core2core hsc_env pcs_middle flat_result + ; simpl_result <- _scc_ "Core2Core" + core2core hsc_env flat_result ------------------- -- TIDY ------------------- - ; 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 + ; tidy_result <- _scc_ "CoreTidy" + tidyCorePgm hsc_env simpl_result + + -- Emit external core + ; emitExternalCore dflags tidy_result -- Alive at this point: -- tidy_result, pcs_final - - ------------------- - -- 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 + -- hsc_env ------------------- -- BUILD THE NEW ModIface and ModDetails @@ -289,90 +374,109 @@ hscRecomp hsc_env pcs_ch have_object -- 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 + ; new_iface <- _scc_ "MkFinalIface" + mkIface hsc_env (ms_location mod_summary) maybe_checked_iface tidy_result - ; let final_details = ModDetails { md_types = mg_types tidy_result, + + -- Space leak reduction: throw away the new interface if + -- we're in one-shot mode; we won't be needing it any + -- more. + ; final_iface <- + if one_shot then return (error "no final iface") + else return new_iface + + -- Build the final ModDetails (except in one-shot mode, where + -- we won't need this information after compilation). + ; final_details <- + if one_shot then return (error "no final details") + else return $! 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 + ------------------- + -- CONVERT TO STG and COMPLETE CODE GENERATION + ; (stub_h_exists, stub_c_exists, maybe_bcos) + <- hscCodeGen dflags tidy_result + + -- And the answer is ... + ; dumpIfaceStats hsc_env + + ; return (HscRecomp 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 { - - ------------------- - -- 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 { +hscFileCheck hsc_env msg_act hspp_file = do { ------------------- -- PARSE ------------------- - ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) - (expectJust "hscFrontEnd:hspp" (ml_hspp_file location)) + ; maybe_parsed <- myParseModule (hsc_dflags hsc_env) hspp_file Nothing ; case maybe_parsed of { - Nothing -> return (Left (HscFail pcs_ch)); - Just rdr_module -> do { - - ------------------- - -- RENAME and TYPECHECK - ------------------- - ; (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 { + Left err -> do { msg_act (unitBag err, emptyBag) ; + ; return HscFail ; + }; + Right rdr_module -> hscBufferTypecheck hsc_env rdr_module msg_act + }} + + +-- Perform static/dynamic checks on the source code in a StringBuffer +-- This is a temporary solution: it'll read in interface files lazily, whereas +-- we probably want to use the compilation manager to load in all the modules +-- in a project. +hscBufferCheck :: HscEnv -> StringBuffer -> MessageAction -> IO HscResult +hscBufferCheck hsc_env buffer msg_act = do + let loc = mkSrcLoc (mkFastString "*edit*") 1 0 + showPass (hsc_dflags hsc_env) "Parser" + case unP parseModule (mkPState buffer loc (hsc_dflags hsc_env)) of + PFailed span err -> do + msg_act (emptyBag, unitBag (mkPlainErrMsg span err)) + return HscFail + POk _ rdr_module -> do + hscBufferTypecheck hsc_env rdr_module msg_act + +hscBufferTypecheck hsc_env rdr_module msg_act = do + (tc_msgs, maybe_tc_result) <- _scc_ "Typecheck-Rename" + tcRnModule hsc_env HsSrcFile rdr_module + msg_act tc_msgs + case maybe_tc_result of + Nothing -> return (HscChecked rdr_module Nothing) + -- space leak on rdr_module! + Just r -> return (HscChecked rdr_module (Just r)) + + +hscCodeGen dflags + ModGuts{ -- This is the last use of the ModGuts in a compilation. + -- From now on, we just use the bits we need. + mg_module = this_mod, + mg_binds = core_binds, + mg_types = type_env, + mg_dir_imps = dir_imps, + mg_foreign = foreign_stubs, + mg_deps = dependencies } = do { ------------------- - -- DESUGAR - ------------------- - ; ds_result <- _scc_ "DeSugar" - deSugar hsc_env pcs_tc tc_result - ; return (Right (pcs_tc, ds_result)) - }}}}} - + -- PREPARE FOR CODE GENERATION + -- Do saturation and convert to A-normal form + prepd_binds <- _scc_ "CorePrep" + corePrepPgm dflags core_binds type_env; -hscBackEnd dflags cg_info_ref prepd_result - = case dopt_HscLang dflags of + case dopt_HscTarget dflags of HscNothing -> return (False, False, Nothing) HscInterpreted -> #ifdef GHCI do ----------------- Generate byte code ------------------ - comp_bc <- byteCodeGen dflags prepd_result + comp_bc <- byteCodeGen dflags prepd_binds type_env - -- 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) + <- outputForeignStubs dflags foreign_stubs - return ( istub_h_exists, istub_c_exists, - Just comp_bc ) + return ( istub_h_exists, istub_c_exists, Just comp_bc ) #else panic "GHC not compiled with interpreter" #endif @@ -380,42 +484,52 @@ hscBackEnd dflags cg_info_ref prepd_result 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) + (stg_binds, cost_centre_info) <- _scc_ "CoreToStg" + myCoreToStg dflags this_mod prepd_binds ------------------ Code generation ------------------ abstractC <- _scc_ "CodeGen" - codeGen dflags prepd_result - cost_centre_info stg_binds - + codeGen dflags this_mod type_env foreign_stubs + dir_imps cost_centre_info stg_binds + ------------------ Code output ----------------------- (stub_h_exists, stub_c_exists) - <- codeOutput dflags prepd_result abstractC - + <- codeOutput dflags this_mod foreign_stubs + dependencies abstractC + return (stub_h_exists, stub_c_exists, Nothing) + } + + +hscCmmFile :: DynFlags -> FilePath -> IO Bool +hscCmmFile dflags filename = do + maybe_cmm <- parseCmmFile dflags filename + case maybe_cmm of + Nothing -> return False + Just cmm -> do + codeOutput dflags no_mod NoStubs noDependencies [cmm] + return True + where + no_mod = panic "hscCmmFile: no_mod" -myParseModule dflags src_filename +myParseModule dflags src_filename maybe_src_buf = do -------------------------- Parser ---------------- showPass dflags "Parser" _scc_ "Parser" do - buf <- hGetStringBuffer 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 + -- sometimes we already have the buffer in memory, perhaps + -- because we needed to parse the imports out of it, or get the + -- module name. + buf <- case maybe_src_buf of + Just b -> return b + Nothing -> hGetStringBuffer src_filename + + let loc = mkSrcLoc (mkFastString src_filename) 1 0 - case parseModule buf (mkPState loc exts) of { + case unP parseModule (mkPState buf loc dflags) of { - PFailed err -> do { hPutStrLn stderr (showSDoc err); - freeStringBuffer buf; - return Nothing }; + PFailed span err -> return (Left (mkPlainErrMsg span err)); POk _ rdr_module -> do { @@ -424,35 +538,20 @@ myParseModule dflags src_filename dumpIfSet_dyn dflags Opt_D_source_stats "Source Statistics" (ppSourceStats False rdr_module) ; - return (Just rdr_module) + return (Right rdr_module) -- ToDo: free the string buffer later. }} -myCoreToStg dflags (ModGuts {mg_module = this_mod, mg_binds = tidy_binds}) +myCoreToStg dflags this_mod prepd_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 -- JRS - -- - -- This is still necessary. -- SDM (10 Dec 2001) - stg_binds <- _scc_ "Core2Stg" - coreToStg dflags tidy_binds + coreToStg dflags prepd_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, env_rhs) + return (stg_binds2, cost_centre_info) \end{code} @@ -492,82 +591,100 @@ A naked expression returns a singleton Name [it]. #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) ) + -> IO (Maybe (InteractiveContext, [Name], HValue)) -hscStmt hsc_env pcs icontext stmt +hscStmt hsc_env icontext stmt = do { maybe_stmt <- hscParseStmt (hsc_dflags hsc_env) stmt ; case maybe_stmt of { - Nothing -> return (pcs, Nothing) ; - Just parsed_stmt -> do { + Nothing -> return Nothing ; -- Parse error + Just Nothing -> return Nothing ; -- Empty line + Just (Just parsed_stmt) -> do { -- The real stuff -- Rename and typecheck it - (pcs1, maybe_tc_result) - <- tcRnStmt hsc_env pcs icontext parsed_stmt + maybe_tc_result + <- tcRnStmt hsc_env icontext parsed_stmt ; case maybe_tc_result of { - Nothing -> return (pcs1, Nothing) ; + Nothing -> return Nothing ; Just (new_ic, bound_names, tc_expr) -> do { -- Then desugar, code gen, and link it - ; hval <- compileExpr hsc_env pcs1 iNTERACTIVE + ; hval <- compileExpr hsc_env iNTERACTIVE (ic_rn_gbl_env new_ic) (ic_type_env new_ic) tc_expr - ; return (pcs1, Just (new_ic, bound_names, hval)) + ; return (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) + -> IO (Maybe Type) -hscTcExpr hsc_env pcs icontext expr +hscTcExpr hsc_env 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) } } + Nothing -> return Nothing ; -- Parse error + Just (Just (L _ (ExprStmt expr _))) + -> tcRnExpr hsc_env icontext expr ; + Just other -> do { errorMsg ("not an expression: `" ++ expr ++ "'") ; + return Nothing } ; + } } + +hscKcType -- Find the kind of a type + :: HscEnv + -> InteractiveContext -- Context for compiling + -> String -- The type + -> IO (Maybe Kind) + +hscKcType hsc_env icontext str + = do { maybe_type <- hscParseType (hsc_dflags hsc_env) str + ; case maybe_type of { + Just ty -> tcRnType hsc_env icontext ty ; + Just other -> do { errorMsg ("not an type: `" ++ str ++ "'") ; + return Nothing } ; + Nothing -> return Nothing } } \end{code} \begin{code} -hscParseStmt :: DynFlags -> String -> IO (Maybe RdrNameStmt) -hscParseStmt dflags str +hscParseStmt :: DynFlags -> String -> IO (Maybe (Maybe (LStmt RdrName))) +hscParseStmt = hscParseThing parseStmt + +hscParseType :: DynFlags -> String -> IO (Maybe (LHsType RdrName)) +hscParseType = hscParseThing parseType + +hscParseIdentifier :: DynFlags -> String -> IO (Maybe (Located RdrName)) +hscParseIdentifier = hscParseThing parseIdentifier + +hscParseThing :: Outputable thing + => Lexer.P thing + -> DynFlags -> String + -> IO (Maybe thing) + -- Nothing => Parse error (message already printed) + -- Just x => success +hscParseThing parser dflags str = do showPass dflags "Parser" _scc_ "Parser" 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 + let loc = mkSrcLoc FSLIT("") 1 0 - case parseStmt buf (mkPState loc exts) of { + case unP parser (mkPState buf loc dflags) of { - PFailed err -> do { hPutStrLn stderr (showSDoc err); --- Not yet implemented in <4.11 freeStringBuffer buf; - return Nothing }; + PFailed span err -> do { printError span err; + return Nothing }; - -- no stmt: the line consisted of just space or comments - POk _ Nothing -> return Nothing; - - POk _ (Just rdr_stmt) -> do { + POk _ thing -> 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_stmt); - return (Just rdr_stmt) + dumpIfSet_dyn dflags Opt_D_dump_parsed "Parser" (ppr thing); + return (Just thing) }} #endif \end{code} @@ -580,47 +697,30 @@ hscParseStmt dflags str \begin{code} #ifdef GHCI -hscThing -- like hscStmt, but deals with a single identifier +type GetInfoResult = (String, (IfaceDecl, Fixity, SrcLoc, [(IfaceInst,SrcLoc)])) + +hscGetInfo -- like hscStmt, but deals with a single identifier :: HscEnv - -> PersistentCompilerState -- IN: persistent compiler state -> InteractiveContext -- Context for compiling -> String -- The identifier - -> IO ( PersistentCompilerState, - [TyThing] ) + -> IO [GetInfoResult] -hscThing hsc_env pcs0 ic str - = do let dflags = hsc_dflags hsc_env - - maybe_rdr_name <- myParseIdentifier dflags str +hscGetInfo hsc_env ic str + = do maybe_rdr_name <- hscParseIdentifier (hsc_dflags hsc_env) str case maybe_rdr_name of { - Nothing -> return (pcs0, []); - Just rdr_name -> do + Nothing -> return []; + Just (L _ rdr_name) -> do + + maybe_tc_result <- tcRnGetInfo hsc_env ic rdr_name - (pcs1, maybe_tc_result) <- - tcRnThing hsc_env pcs0 ic rdr_name + let -- str' is the the naked occurrence name + -- after stripping off qualification and parens (+) + str' = occNameUserString (rdrNameOcc rdr_name) case maybe_tc_result of { - Nothing -> return (pcs1, []) ; - Just things -> return (pcs1, things) + Nothing -> return [] ; + Just things -> return [(str', t) | t <- 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} @@ -633,20 +733,19 @@ myParseIdentifier dflags str \begin{code} #ifdef GHCI compileExpr :: HscEnv - -> PersistentCompilerState -> Module -> GlobalRdrEnv -> TypeEnv - -> TypecheckedHsExpr + -> LHsExpr Id -> IO HValue -compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr +compileExpr hsc_env 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 + ; ds_expr <- deSugarExpr hsc_env this_mod rdr_env type_env tc_expr -- Flatten it - ; flat_expr <- flattenExpr hsc_env pcs ds_expr + ; flat_expr <- flattenExpr hsc_env ds_expr -- Simplify it ; simpl_expr <- simplifyExpr dflags flat_expr @@ -670,7 +769,7 @@ compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr ; bcos <- coreExprToBCOs dflags prepd_expr -- link it - ; hval <- linkExpr hsc_env pcs bcos + ; hval <- linkExpr hsc_env bcos ; return hval } @@ -680,51 +779,19 @@ compileExpr hsc_env pcs this_mod rdr_env type_env tc_expr %************************************************************************ %* * -\subsection{Initial persistent state} + Statistics on reading interfaces %* * %************************************************************************ \begin{code} -initPersistentCompilerState :: IO PersistentCompilerState -initPersistentCompilerState - = do nc <- initNameCache - return ( - PCS { pcs_EPS = initExternalPackageState, - pcs_nc = nc }) - -initNameCache :: IO NameCache - = do us <- mkSplitUniqSupply 'r' - 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 - = insert knownKeyNames $ - insert (map getName wiredInThings) $ - emptyModuleEnv +dumpIfaceStats :: HscEnv -> IO () +dumpIfaceStats hsc_env + = do { eps <- readIORef (hsc_EPS hsc_env) + ; dumpIfSet (dump_if_trace || dump_rn_stats) + "Interface statistics" + (ifaceStats eps) } where - insert names env = foldl extendOrigNameCache env names + dflags = hsc_dflags hsc_env + dump_rn_stats = dopt Opt_D_dump_rn_stats dflags + dump_if_trace = dopt Opt_D_dump_if_trace dflags \end{code}