X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fmain%2FHscMain.lhs;h=6c09b97c93d25e4c0fe04be9e5db9d660de4d4f2;hb=d5934bbb856aa0aa620c9b2e0fa51c90a1a5a048;hp=c511aa2d2f784d7aff50e9e564dd61aa8837a92d;hpb=14a9478a67c6b4f43dc8bc06ef86c52ddb9e6f41;p=ghc-hetmet.git

diff --git a/compiler/main/HscMain.lhs b/compiler/main/HscMain.lhs
index c511aa2..6c09b97 100644
--- a/compiler/main/HscMain.lhs
+++ b/compiler/main/HscMain.lhs
@@ -90,9 +90,10 @@ import ParserCoreUtils
 import FastString
 import UniqFM		( emptyUFM )
 import Bag		( unitBag )
-import Monad		( unless )
-import IO
-import DATA_IOREF	( newIORef, readIORef )
+
+import Control.Monad
+import System.IO
+import Data.IORef
 \end{code}
 
 
@@ -465,7 +466,7 @@ hscFileFrontEnd =
                          -------------------
                          -- DESUGAR
                          -------------------
-                         -> {-# SCC "DeSugar" #-} deSugar hsc_env tc_result
+                         -> {-# SCC "DeSugar" #-} deSugar hsc_env (ms_location mod_summary) tc_result
 
 --------------------------------------------------------------
 -- Simplifiers
@@ -527,7 +528,7 @@ hscNormalIface simpl_result
 		<- {-# SCC "MkFinalIface" #-}
 		   mkIface hsc_env maybe_old_iface simpl_result details
 	-- Emit external core
-       emitExternalCore (hsc_dflags hsc_env) (mg_exports simpl_result) cg_guts -- Move this? --Lemmih 03/07/2006
+       emitExternalCore (hsc_dflags hsc_env) (availsToNameSet (mg_exports simpl_result)) cg_guts -- Move this? --Lemmih 03/07/2006
        dumpIfaceStats hsc_env
 
  	    -------------------
@@ -541,9 +542,11 @@ hscNormalIface simpl_result
 hscWriteIface :: (ModIface, Bool, ModDetails, a) -> Comp (ModIface, ModDetails, a)
 hscWriteIface (iface, no_change, details, a)
     = do mod_summary <- gets compModSummary
+         hsc_env <- gets compHscEnv
+         let dflags = hsc_dflags hsc_env
          liftIO $ do
          unless no_change
-           $ writeIfaceFile (ms_location mod_summary) iface
+           $ writeIfaceFile dflags (ms_location mod_summary) iface
          return (iface, details, a)
 
 hscIgnoreIface :: (ModIface, Bool, ModDetails, a) -> Comp (ModIface, ModDetails, a)
@@ -580,7 +583,8 @@ hscCompile cgguts
                      cg_tycons   = tycons,
                      cg_dir_imps = dir_imps,
                      cg_foreign  = foreign_stubs,
-                     cg_dep_pkgs = dependencies } = cgguts
+                     cg_dep_pkgs = dependencies,
+		     cg_hpc_info = hpc_info } = cgguts
              dflags = hsc_dflags hsc_env
              location = ms_location mod_summary
              data_tycons = filter isDataTyCon tycons
@@ -600,7 +604,7 @@ hscCompile cgguts
          abstractC <- {-# SCC "CodeGen" #-}
                       codeGen dflags this_mod data_tycons
                               foreign_stubs dir_imps cost_centre_info
-                              stg_binds
+                              stg_binds hpc_info
          ------------------  Code output -----------------------
          (stub_h_exists,stub_c_exists)
              <- codeOutput dflags this_mod location foreign_stubs 
@@ -678,9 +682,9 @@ hscFileCheck hsc_env mod_summary = do {
 		let type_env = tcg_type_env tc_result
 		    md = ModDetails { 
 				md_types     = type_env,
-				md_exports   = tcg_exports  tc_result,
-				md_insts     = tcg_insts    tc_result,
-				md_fam_insts = mkDetailsFamInstCache type_env,
+				md_exports   = tcg_exports   tc_result,
+				md_insts     = tcg_insts     tc_result,
+				md_fam_insts = tcg_fam_insts tc_result,
 				md_rules     = [panic "no rules"] }
 				   -- Rules are CoreRules, not the
 				   -- RuleDecls we get out of the typechecker