X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2Fmain%2FHscMain.lhs;h=b8e9e5037a97d80d5d802aef0c48c61c84dd6ba8;hb=3abbe090b273dcaa02b3ba7eb6232e89d0a7142f;hp=4e826e16a8c6b0a99aabe0317ea2ca363ac97549;hpb=28122dd6e891a440493edef9795d68d3f3c2af46;p=ghc-hetmet.git diff --git a/ghc/compiler/main/HscMain.lhs b/ghc/compiler/main/HscMain.lhs index 4e826e1..b8e9e50 100644 --- a/ghc/compiler/main/HscMain.lhs +++ b/ghc/compiler/main/HscMain.lhs @@ -12,7 +12,6 @@ module HscMain ( hscParseIdentifier, #ifdef GHCI hscStmt, hscTcExpr, hscKcType, - hscGetInfo, GetInfoResult, compileExpr, #endif ) where @@ -21,7 +20,6 @@ module HscMain ( #ifdef GHCI import HsSyn ( Stmt(..), LHsExpr, LStmt, LHsType ) -import IfaceSyn ( IfaceDecl, IfaceInst ) import Module ( Module ) import CodeOutput ( outputForeignStubs ) import ByteCodeGen ( byteCodeGen, coreExprToBCOs ) @@ -29,23 +27,20 @@ import Linker ( HValue, linkExpr ) import CoreTidy ( tidyExpr ) import CorePrep ( corePrepExpr ) import Flattening ( flattenExpr ) -import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnGetInfo, GetInfoResult, tcRnType ) -import RdrName ( rdrNameOcc ) -import OccName ( occNameUserString ) +import TcRnDriver ( tcRnStmt, tcRnExpr, tcRnType ) import Type ( Type ) import PrelNames ( iNTERACTIVE ) import Kind ( Kind ) import CoreLint ( lintUnfolding ) import DsMeta ( templateHaskellNames ) -import BasicTypes ( Fixity ) -import SrcLoc ( SrcLoc, noSrcLoc ) +import SrcLoc ( noSrcLoc ) import VarEnv ( emptyTidyEnv ) #endif import Var ( Id ) -import Module ( emptyModuleEnv ) +import Module ( emptyModuleEnv, ModLocation(..) ) import RdrName ( GlobalRdrEnv, RdrName ) -import HsSyn ( HsModule, LHsBinds, HsGroup ) +import HsSyn ( HsModule, LHsBinds, HsGroup, LIE, LImportDecl ) import SrcLoc ( Located(..) ) import StringBuffer ( hGetStringBuffer, stringToStringBuffer ) import Parser @@ -65,6 +60,7 @@ import TidyPgm ( tidyProgram, mkBootModDetails ) import CorePrep ( corePrepPgm ) import CoreToStg ( coreToStg ) import TyCon ( isDataTyCon ) +import Packages ( mkHomeModules ) import Name ( Name, NamedThing(..) ) import SimplStg ( stg2stg ) import CodeGen ( codeGen ) @@ -72,8 +68,8 @@ import CmmParse ( parseCmmFile ) import CodeOutput ( codeOutput ) import DynFlags -import DriverPhases ( HscSource(..) ) import ErrUtils +import Util import UniqSupply ( mkSplitUniqSupply ) import Outputable @@ -84,7 +80,7 @@ import ParserCore import ParserCoreUtils import FastString import Maybes ( expectJust ) -import Bag ( unitBag, emptyBag ) +import Bag ( unitBag ) import Monad ( when ) import Maybe ( isJust ) import IO @@ -138,9 +134,12 @@ data HscResult -- In IDE mode: we just do the static/dynamic checks | HscChecked - (Located (HsModule RdrName)) -- parsed - (Maybe (HsGroup Name)) -- renamed - (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails)) -- typechecked + -- parsed + (Located (HsModule RdrName)) + -- renamed + (Maybe (HsGroup Name,[LImportDecl Name],Maybe [LIE Name])) + -- typechecked + (Maybe (LHsBinds Id, GlobalRdrEnv, ModDetails)) -- Concluded that it wasn't necessary | HscNoRecomp ModDetails -- new details (HomeSymbolTable additions) @@ -157,12 +156,345 @@ data HscResult -- What to do when we have compiler error or warning messages type MessageAction = Messages -> IO () + +-------------------------------------------------------------- +-- Exterimental code start. +-------------------------------------------------------------- + +data HscStatus + = NewHscNoRecomp + | NewHscRecomp Bool -- Has stub files. + -- This is a hack. We can't compile C files here + -- since it's done in DriverPipeline. For now we + -- just return True if we want the caller to compile + -- it for us. + +data InteractiveStatus + = InteractiveNoRecomp + | InteractiveRecomp Bool -- Same as HscStatus + CompiledByteCode + +type NoRecomp result = HscEnv -> ModSummary -> Bool -> ModIface -> Maybe (Int,Int) -> IO result +type FrontEnd core = HscEnv -> ModSummary -> Maybe (Int,Int) -> IO (Maybe core) +type BackEnd core prepCore = HscEnv -> ModSummary -> Maybe ModIface -> core -> IO prepCore +type CodeGen prepCore result = HscEnv -> ModSummary -> prepCore -> IO result + +type Compiler result = HscEnv + -> ModSummary + -> Bool -- True <=> source unchanged + -> Bool -- True <=> have an object file (for msgs only) + -> Maybe ModIface -- Old interface, if available + -> Maybe (Int,Int) -- Just (i,n) <=> module i of n (for msgs) + -> IO (Maybe result) + + +hscMkCompiler :: NoRecomp result -- What to do when recompilation isn't required. + -> FrontEnd core + -> BackEnd core prepCore + -> CodeGen prepCore result + -> Compiler result +hscMkCompiler norecomp frontend backend codegen + hsc_env mod_summary source_unchanged + have_object mbOldIface mbModIndex + = do (recomp_reqd, mbCheckedIface) + <- {-# SCC "checkOldIface" #-} + checkOldIface hsc_env mod_summary + source_unchanged mbOldIface + case mbCheckedIface of + Just iface | not recomp_reqd + -> do result <- norecomp hsc_env mod_summary have_object iface mbModIndex + return (Just result) + _otherwise + -> do mbCore <- frontend hsc_env mod_summary mbModIndex + case mbCore of + Nothing + -> return Nothing + Just core + -> do prepCore <- backend hsc_env mod_summary + mbCheckedIface core + result <- codegen hsc_env mod_summary prepCore + return (Just result) + +-- Compile Haskell, boot and extCore in OneShot mode. +hscCompileOneShot :: Compiler HscStatus +hscCompileOneShot hsc_env mod_summary = + compiler hsc_env mod_summary + where mkComp = hscMkCompiler (norecompOneShot NewHscNoRecomp) + compiler + = case ms_hsc_src mod_summary of + ExtCoreFile + -> mkComp hscCoreFrontEnd hscNewBackEnd hscCodeGenOneShot +-- 1 2 3 4 5 6 7 8 9 + HsSrcFile + -> mkComp hscFileFrontEnd hscNewBackEnd hscCodeGenOneShot + HsBootFile + -> mkComp hscFileFrontEnd hscNewBootBackEnd + (hscCodeGenConst (NewHscRecomp False)) + +-- Compile Haskell, boot and extCore in --make mode. +hscCompileMake :: Compiler (HscStatus, ModIface, ModDetails) +hscCompileMake hsc_env mod_summary + = compiler hsc_env mod_summary + where mkComp = hscMkCompiler norecompMake + compiler + = case ms_hsc_src mod_summary of + ExtCoreFile + -> mkComp hscCoreFrontEnd hscNewBackEnd hscCodeGenMake + HsSrcFile + -> mkComp hscFileFrontEnd hscNewBackEnd hscCodeGenMake + HsBootFile + -> mkComp hscFileFrontEnd hscNewBootBackEnd hscCodeGenIdentity + +-- Same as 'hscCompileMake' but don't generate any actual code. +hscCompileMakeNothing :: Compiler (HscStatus, ModIface, ModDetails) +hscCompileMakeNothing hsc_env mod_summary + = compiler hsc_env mod_summary + where mkComp = hscMkCompiler norecompMake + codeGen = hscCodeGenSimple (\(i, d, g) -> (NewHscRecomp False, i, d)) + compiler + = case ms_hsc_src mod_summary of + ExtCoreFile + -> mkComp hscCoreFrontEnd hscNewBackEnd + codeGen + HsSrcFile + -> mkComp hscFileFrontEnd hscNewBackEnd + codeGen + HsBootFile + -> mkComp hscFileFrontEnd hscNewBootBackEnd + hscCodeGenIdentity + +-- Compile Haskell, extCore to bytecode. +hscCompileInteractive :: Compiler (InteractiveStatus, ModIface, ModDetails) +hscCompileInteractive hsc_env mod_summary = + hscMkCompiler norecompInteractive frontend hscNewBackEnd hscCodeGenInteractive + hsc_env mod_summary + where frontend = case ms_hsc_src mod_summary of + ExtCoreFile -> hscCoreFrontEnd + HsSrcFile -> hscFileFrontEnd + HsBootFile -> panic bootErrorMsg + bootErrorMsg = "Compiling a HsBootFile to bytecode doesn't make sense. " ++ + "Use 'hscCompileMake' instead." + +norecompOneShot :: a -> NoRecomp a +norecompOneShot a hsc_env mod_summary + have_object old_iface + mb_mod_index + = do compilationProgressMsg (hsc_dflags hsc_env) $ + "compilation IS NOT required" + dumpIfaceStats hsc_env + return a + +norecompMake :: NoRecomp (HscStatus, ModIface, ModDetails) +norecompMake = norecompWorker NewHscNoRecomp + +norecompInteractive :: NoRecomp (InteractiveStatus, ModIface, ModDetails) +norecompInteractive = norecompWorker InteractiveNoRecomp + +norecompWorker :: a -> NoRecomp (a, ModIface, ModDetails) +norecompWorker a hsc_env mod_summary have_object + old_iface mb_mod_index + = do compilationProgressMsg (hsc_dflags hsc_env) $ + (showModuleIndex mb_mod_index ++ + "Skipping " ++ showModMsg have_object mod_summary) + new_details <- {-# SCC "tcRnIface" #-} + initIfaceCheck hsc_env $ + typecheckIface old_iface + dumpIfaceStats hsc_env + return (a, old_iface, new_details) + +hscNewBootBackEnd :: BackEnd ModGuts (HscStatus, ModIface, ModDetails) +hscNewBootBackEnd hsc_env mod_summary maybe_old_iface ds_result + = do details <- mkBootModDetails hsc_env ds_result + (new_iface, no_change) + <- {-# SCC "MkFinalIface" #-} + mkIface hsc_env maybe_old_iface ds_result details + writeIfaceFile hsc_env (ms_location mod_summary) new_iface no_change + -- And the answer is ... + dumpIfaceStats hsc_env + return (NewHscRecomp False, new_iface, details) + +hscNewBackEnd :: BackEnd ModGuts (ModIface, ModDetails, CgGuts) +hscNewBackEnd hsc_env mod_summary maybe_old_iface ds_result + = do { -- OMITTED: + -- ; seqList imported_modules (return ()) + + let dflags = hsc_dflags hsc_env + + ------------------- + -- FLATTENING + ------------------- + ; flat_result <- {-# SCC "Flattening" #-} + flatten hsc_env ds_result + + +{- 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 flat_result + + ------------------- + -- TIDY + ------------------- + ; (cg_guts, details) <- {-# SCC "CoreTidy" #-} + tidyProgram hsc_env simpl_result + + -- Alive at this point: + -- tidy_result, pcs_final + -- hsc_env + + ------------------- + -- 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 + ; (new_iface, no_change) + <- {-# SCC "MkFinalIface" #-} + mkIface hsc_env maybe_old_iface simpl_result details + + ; writeIfaceFile hsc_env (ms_location mod_summary) new_iface no_change + + -- Emit external core + ; emitExternalCore dflags cg_guts + + ------------------- + -- Return the prepared code. + ; return (new_iface, details, cg_guts) + } + +-- Don't output any code. +hscCodeGenNothing :: CodeGen (ModIface, ModDetails, CgGuts) (HscStatus, ModIface, ModDetails) +hscCodeGenNothing hsc_env mod_summary (iface, details, cgguts) + = return (NewHscRecomp False, iface, details) + +-- Generate code and return both the new ModIface and the ModDetails. +hscCodeGenMake :: CodeGen (ModIface, ModDetails, CgGuts) (HscStatus, ModIface, ModDetails) +hscCodeGenMake hsc_env mod_summary (iface, details, cgguts) + = do hasStub <- hscCodeGenCompile hsc_env mod_summary cgguts + return (NewHscRecomp hasStub, iface, details) + +-- Here we don't need the ModIface and ModDetails anymore. +hscCodeGenOneShot :: CodeGen (ModIface, ModDetails, CgGuts) HscStatus +hscCodeGenOneShot hsc_env mod_summary (_, _, cgguts) + = do hasStub <- hscCodeGenCompile hsc_env mod_summary cgguts + return (NewHscRecomp hasStub) + +hscCodeGenCompile :: CodeGen CgGuts Bool +hscCodeGenCompile hsc_env mod_summary cgguts + = do let CgGuts{ -- This is the last use of the ModGuts in a compilation. + -- From now on, we just use the bits we need. + cg_module = this_mod, + cg_binds = core_binds, + cg_tycons = tycons, + cg_dir_imps = dir_imps, + cg_foreign = foreign_stubs, + cg_home_mods = home_mods, + cg_dep_pkgs = dependencies } = cgguts + dflags = hsc_dflags hsc_env + location = ms_location mod_summary + modName = ms_mod mod_summary + data_tycons = filter isDataTyCon tycons + -- cg_tycons includes newtypes, for the benefit of External Core, + -- but we don't generate any code for newtypes + + ------------------- + -- PREPARE FOR CODE GENERATION + -- Do saturation and convert to A-normal form + prepd_binds <- {-# SCC "CorePrep" #-} + corePrepPgm dflags core_binds data_tycons ; + ----------------- Convert to STG ------------------ + (stg_binds, cost_centre_info) + <- {-# SCC "CoreToStg" #-} + myCoreToStg dflags home_mods this_mod prepd_binds + ------------------ Code generation ------------------ + abstractC <- {-# SCC "CodeGen" #-} + codeGen dflags home_mods this_mod data_tycons + foreign_stubs dir_imps cost_centre_info + stg_binds + ------------------ Code output ----------------------- + (stub_h_exists,stub_c_exists) + <- codeOutput dflags this_mod location foreign_stubs + dependencies abstractC + return stub_c_exists + +hscCodeGenIdentity :: CodeGen a a +hscCodeGenIdentity hsc_env mod_summary a = return a + +hscCodeGenSimple :: (a -> b) -> CodeGen a b +hscCodeGenSimple fn hsc_env mod_summary a = return (fn a) + +hscCodeGenConst :: b -> CodeGen a b +hscCodeGenConst b hsc_env mod_summary a = return b + +hscCodeGenInteractive :: CodeGen (ModIface, ModDetails, CgGuts) + (InteractiveStatus, ModIface, ModDetails) +hscCodeGenInteractive hsc_env mod_summary (iface, details, cgguts) +#ifdef GHCI + = do let CgGuts{ -- This is the last use of the ModGuts in a compilation. + -- From now on, we just use the bits we need. + cg_module = this_mod, + cg_binds = core_binds, + cg_tycons = tycons, + cg_foreign = foreign_stubs, + cg_home_mods = home_mods, + cg_dep_pkgs = dependencies } = cgguts + dflags = hsc_dflags hsc_env + location = ms_location mod_summary + modName = ms_mod mod_summary + data_tycons = filter isDataTyCon tycons + -- cg_tycons includes newtypes, for the benefit of External Core, + -- but we don't generate any code for newtypes + + ------------------- + -- PREPARE FOR CODE GENERATION + -- Do saturation and convert to A-normal form + prepd_binds <- {-# SCC "CorePrep" #-} + corePrepPgm dflags core_binds data_tycons ; + ----------------- Generate byte code ------------------ + comp_bc <- byteCodeGen dflags prepd_binds data_tycons + ------------------ Create f-x-dynamic C-side stuff --- + (istub_h_exists, istub_c_exists) + <- outputForeignStubs dflags this_mod location foreign_stubs + return (InteractiveRecomp istub_c_exists comp_bc, iface, details) +#else + = panic "GHC not compiled with interpreter" +#endif + + + +-------------------------------------------------------------- +-- Exterimental code end. +-------------------------------------------------------------- + -- no errors or warnings; the individual passes -- (parse/rename/typecheck) print messages themselves hscMain :: HscEnv - -> MessageAction -- What to do with errors/warnings -> ModSummary -> Bool -- True <=> source unchanged -> Bool -- True <=> have an object file (for msgs only) @@ -170,7 +502,7 @@ hscMain -> Maybe (Int, Int) -- Just (i,n) <=> module i of n (for msgs) -> IO HscResult -hscMain hsc_env msg_act mod_summary +hscMain hsc_env mod_summary source_unchanged have_object maybe_old_iface mb_mod_index = do { @@ -183,14 +515,14 @@ hscMain hsc_env msg_act mod_summary what_next | recomp_reqd || no_old_iface = hscRecomp | otherwise = hscNoRecomp - ; what_next hsc_env msg_act mod_summary have_object + ; what_next hsc_env mod_summary have_object maybe_checked_iface mb_mod_index } ------------------------------ -hscNoRecomp hsc_env msg_act mod_summary +hscNoRecomp hsc_env mod_summary have_object (Just old_iface) mb_mod_index | isOneShot (ghcMode (hsc_dflags hsc_env)) @@ -215,36 +547,38 @@ hscNoRecomp hsc_env msg_act mod_summary ; return (HscNoRecomp new_details old_iface) } -hscNoRecomp hsc_env msg_act mod_summary +hscNoRecomp hsc_env mod_summary have_object Nothing mb_mod_index = panic "hscNoRecomp" -- hscNoRecomp definitely expects to -- have the old interface available ------------------------------ -hscRecomp hsc_env msg_act mod_summary +hscRecomp hsc_env mod_summary have_object maybe_old_iface mb_mod_index = case ms_hsc_src mod_summary of - HsSrcFile -> do - front_res <- hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index - hscBackEnd hsc_env mod_summary maybe_old_iface front_res + HsSrcFile -> do + front_res <- hscFileFrontEnd hsc_env mod_summary mb_mod_index + case ghcMode (hsc_dflags hsc_env) of + JustTypecheck -> hscBootBackEnd hsc_env mod_summary maybe_old_iface front_res + _ -> hscBackEnd hsc_env mod_summary maybe_old_iface front_res HsBootFile -> do - front_res <- hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index + front_res <- hscFileFrontEnd hsc_env mod_summary mb_mod_index hscBootBackEnd hsc_env mod_summary maybe_old_iface front_res ExtCoreFile -> do - front_res <- hscCoreFrontEnd hsc_env msg_act mod_summary + front_res <- hscCoreFrontEnd hsc_env mod_summary mb_mod_index hscBackEnd hsc_env mod_summary maybe_old_iface front_res -hscCoreFrontEnd hsc_env msg_act mod_summary = do { +hscCoreFrontEnd hsc_env mod_summary mb_mod_index = do { ------------------- -- PARSE ------------------- ; inp <- readFile (expectJust "hscCoreFrontEnd" (ms_hspp_file mod_summary)) ; case parseCore inp 1 of - FailP s -> putMsg s{-ToDo: wrong-} >> return Nothing + FailP s -> errorMsg (hsc_dflags hsc_env) (text s{-ToDo: wrong-}) >> return Nothing OkP rdr_module -> do { ------------------- @@ -252,20 +586,20 @@ hscCoreFrontEnd hsc_env msg_act mod_summary = do { ------------------- ; (tc_msgs, maybe_tc_result) <- {-# SCC "TypeCheck" #-} tcRnExtCore hsc_env rdr_module - ; msg_act tc_msgs + ; printErrorsAndWarnings (hsc_dflags hsc_env) tc_msgs ; case maybe_tc_result of Nothing -> return Nothing Just mod_guts -> return (Just mod_guts) -- No desugaring to do! }} -hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index = do { +hscFileFrontEnd hsc_env mod_summary mb_mod_index = do { ------------------- -- DISPLAY PROGRESS MESSAGE ------------------- - let one_shot = isOneShot (ghcMode (hsc_dflags hsc_env)) - ; let dflags = hsc_dflags hsc_env - ; let toInterp = hscTarget dflags == HscInterpreted + ; let dflags = hsc_dflags hsc_env + one_shot = isOneShot (ghcMode dflags) + toInterp = hscTarget dflags == HscInterpreted ; when (not one_shot) $ compilationProgressMsg dflags $ (showModuleIndex mb_mod_index ++ @@ -277,10 +611,10 @@ hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index = do { ; 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 + ; maybe_parsed <- myParseModule dflags hspp_file hspp_buf ; case maybe_parsed of { - Left err -> do { msg_act (unitBag err, emptyBag) + Left err -> do { printBagOfErrors dflags (unitBag err) ; return Nothing } ; Right rdr_module -> do { @@ -291,7 +625,7 @@ hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index = do { <- {-# SCC "Typecheck-Rename" #-} tcRnModule hsc_env (ms_hsc_src mod_summary) False rdr_module - ; msg_act tc_msgs + ; printErrorsAndWarnings dflags tc_msgs ; case maybe_tc_result of { Nothing -> return Nothing ; Just tc_result -> do { @@ -301,24 +635,25 @@ hscFileFrontEnd hsc_env msg_act mod_summary mb_mod_index = do { ------------------- ; (warns, maybe_ds_result) <- {-# SCC "DeSugar" #-} deSugar hsc_env tc_result - ; msg_act (warns, emptyBag) + ; printBagOfWarnings dflags warns ; return maybe_ds_result }}}}} ------------------------------ -hscFileCheck :: HscEnv -> MessageAction -> ModSummary -> IO HscResult -hscFileCheck hsc_env msg_act mod_summary = do { +hscFileCheck :: HscEnv -> ModSummary -> IO HscResult +hscFileCheck hsc_env mod_summary = do { ------------------- -- PARSE ------------------- - ; let hspp_file = expectJust "hscFileFrontEnd" (ms_hspp_file mod_summary) + ; let dflags = hsc_dflags hsc_env + 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 + ; maybe_parsed <- myParseModule dflags hspp_file hspp_buf ; case maybe_parsed of { - Left err -> do { msg_act (unitBag err, emptyBag) + Left err -> do { printBagOfErrors dflags (unitBag err) ; return HscFail } ; Right rdr_module -> do { @@ -331,7 +666,7 @@ hscFileCheck hsc_env msg_act mod_summary = do { True{-save renamed syntax-} rdr_module - ; msg_act tc_msgs + ; printErrorsAndWarnings dflags tc_msgs ; case maybe_tc_result of { Nothing -> return (HscChecked rdr_module Nothing Nothing); Just tc_result -> do @@ -342,8 +677,12 @@ hscFileCheck hsc_env msg_act mod_summary = do { md_rules = [panic "no rules"] } -- Rules are CoreRules, not the -- RuleDecls we get out of the typechecker + rnInfo = do decl <- tcg_rn_decls tc_result + imports <- tcg_rn_imports tc_result + let exports = tcg_rn_exports tc_result + return (decl,imports,exports) return (HscChecked rdr_module - (tcg_rn_decls tc_result) + rnInfo (Just (tcg_binds tc_result, tcg_rdr_env tc_result, md))) @@ -459,7 +798,7 @@ hscBackEnd hsc_env mod_summary maybe_old_iface (Just ds_result) ------------------- -- CONVERT TO STG and COMPLETE CODE GENERATION ; (stub_h_exists, stub_c_exists, maybe_bcos) - <- hscCodeGen dflags cg_guts + <- hscCodeGen dflags (ms_location mod_summary) cg_guts -- And the answer is ... ; dumpIfaceStats hsc_env @@ -472,7 +811,7 @@ hscBackEnd hsc_env mod_summary maybe_old_iface (Just ds_result) -hscCodeGen dflags +hscCodeGen dflags location CgGuts{ -- This is the last use of the ModGuts in a compilation. -- From now on, we just use the bits we need. cg_module = this_mod, @@ -480,6 +819,7 @@ hscCodeGen dflags cg_tycons = tycons, cg_dir_imps = dir_imps, cg_foreign = foreign_stubs, + cg_home_mods = home_mods, cg_dep_pkgs = dependencies } = do { let { data_tycons = filter isDataTyCon tycons } ; @@ -502,7 +842,7 @@ hscCodeGen dflags ------------------ Create f-x-dynamic C-side stuff --- (istub_h_exists, istub_c_exists) - <- outputForeignStubs dflags foreign_stubs + <- outputForeignStubs dflags this_mod location foreign_stubs return ( istub_h_exists, istub_c_exists, Just comp_bc ) #else @@ -513,16 +853,17 @@ hscCodeGen dflags do ----------------- Convert to STG ------------------ (stg_binds, cost_centre_info) <- {-# SCC "CoreToStg" #-} - myCoreToStg dflags this_mod prepd_binds + myCoreToStg dflags home_mods this_mod prepd_binds ------------------ Code generation ------------------ abstractC <- {-# SCC "CodeGen" #-} - codeGen dflags this_mod data_tycons foreign_stubs - dir_imps cost_centre_info stg_binds + codeGen dflags home_mods this_mod data_tycons + foreign_stubs dir_imps cost_centre_info + stg_binds ------------------ Code output ----------------------- (stub_h_exists, stub_c_exists) - <- codeOutput dflags this_mod foreign_stubs + <- codeOutput dflags this_mod location foreign_stubs dependencies abstractC return (stub_h_exists, stub_c_exists, Nothing) @@ -531,14 +872,17 @@ hscCodeGen dflags hscCmmFile :: DynFlags -> FilePath -> IO Bool hscCmmFile dflags filename = do - maybe_cmm <- parseCmmFile dflags filename + maybe_cmm <- parseCmmFile dflags (mkHomeModules []) filename case maybe_cmm of Nothing -> return False Just cmm -> do - codeOutput dflags no_mod NoStubs [] [cmm] + codeOutput dflags no_mod no_loc NoStubs [] [cmm] return True where no_mod = panic "hscCmmFile: no_mod" + no_loc = ModLocation{ ml_hs_file = Just filename, + ml_hi_file = panic "hscCmmFile: no hi file", + ml_obj_file = panic "hscCmmFile: no obj file" } myParseModule dflags src_filename maybe_src_buf @@ -571,13 +915,13 @@ myParseModule dflags src_filename maybe_src_buf }} -myCoreToStg dflags this_mod prepd_binds +myCoreToStg dflags home_mods this_mod prepd_binds = do stg_binds <- {-# SCC "Core2Stg" #-} - coreToStg dflags prepd_binds + coreToStg home_mods prepd_binds - (stg_binds2, cost_centre_info) <- {-# SCC "Core2Stg" #-} - stg2stg dflags this_mod stg_binds + (stg_binds2, cost_centre_info) <- {-# SCC "Stg2Stg" #-} + stg2stg dflags home_mods this_mod stg_binds return (stg_binds2, cost_centre_info) \end{code} @@ -658,7 +1002,7 @@ hscTcExpr hsc_env expr Nothing -> return Nothing ; -- Parse error Just (Just (L _ (ExprStmt expr _ _))) -> tcRnExpr hsc_env icontext expr ; - Just other -> do { errorMsg ("not an expression: `" ++ expr ++ "'") ; + Just other -> do { errorMsg (hsc_dflags hsc_env) (text "not an expression:" <+> quotes (text expr)) ; return Nothing } ; } } @@ -672,7 +1016,7 @@ hscKcType hsc_env str ; let icontext = hsc_IC hsc_env ; case maybe_type of { Just ty -> tcRnType hsc_env icontext ty ; - Just other -> do { errorMsg ("not an type: `" ++ str ++ "'") ; + Just other -> do { errorMsg (hsc_dflags hsc_env) (text "not an type:" <+> quotes (text str)) ; return Nothing } ; Nothing -> return Nothing } } #endif @@ -720,34 +1064,6 @@ hscParseThing parser dflags str %************************************************************************ %* * -\subsection{Getting information about an identifer} -%* * -%************************************************************************ - -\begin{code} -#ifdef GHCI -hscGetInfo -- like hscStmt, but deals with a single identifier - :: HscEnv - -> String -- The identifier - -> IO [GetInfoResult] - -hscGetInfo hsc_env str - = do maybe_rdr_name <- hscParseIdentifier (hsc_dflags hsc_env) str - case maybe_rdr_name of { - Nothing -> return []; - Just (L _ rdr_name) -> do - - maybe_tc_result <- tcRnGetInfo hsc_env (hsc_IC hsc_env) rdr_name - - case maybe_tc_result of - Nothing -> return [] - Just things -> return things - } -#endif -\end{code} - -%************************************************************************ -%* * Desugar, simplify, convert to bytecode, and link an expression %* * %************************************************************************