X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2FdeSugar%2FDesugar.lhs;h=970bd2019db68a970440a93e569866461b6806a3;hb=ca8ac1f28138565790289bfd76e742f9c28e3e3b;hp=8fcaf9b93ac874e45606697bdd010e95a0d60777;hpb=49c98d143c382a1341e1046f5ca00819a25691ba;p=ghc-hetmet.git

diff --git a/compiler/deSugar/Desugar.lhs b/compiler/deSugar/Desugar.lhs
index 8fcaf9b..970bd20 100644
--- a/compiler/deSugar/Desugar.lhs
+++ b/compiler/deSugar/Desugar.lhs
@@ -42,8 +42,10 @@ import SrcLoc
 import Maybes
 import FastString
 import Util
-
+import Coverage
+import IOEnv
 import Data.IORef
+
 \end{code}
 
 %************************************************************************
@@ -53,10 +55,11 @@ import Data.IORef
 %************************************************************************
 
 \begin{code}
-deSugar :: HscEnv -> TcGblEnv -> IO (Maybe ModGuts)
+deSugar :: HscEnv -> ModLocation -> TcGblEnv -> IO (Maybe ModGuts)
 -- Can modify PCS by faulting in more declarations
 
 deSugar hsc_env 
+        mod_loc
         tcg_env@(TcGblEnv { tcg_mod       = mod,
 			    tcg_src	  = hsc_src,
 		    	    tcg_type_env  = type_env,
@@ -79,20 +82,27 @@ deSugar hsc_env
 	-- Desugar the program
         ; let export_set = availsToNameSet exports
 	; let auto_scc = mkAutoScc mod export_set
-
+        ; let noDbgSites = []
 	; mb_res <- case ghcMode dflags of
-	             JustTypecheck -> return (Just ([], [], NoStubs))
-	             _             -> initDs hsc_env mod rdr_env type_env $ do
-		                        { core_prs <- dsTopLHsBinds auto_scc binds
+	             JustTypecheck -> return (Just ([], [], NoStubs, noHpcInfo, noDbgSites))
+                     _        -> do (binds_cvr,ds_hpc_info) 
+					      <- if opt_Hpc
+                                                 then addCoverageTicksToBinds dflags mod mod_loc binds
+                                                 else return (binds, noHpcInfo)
+                                    initDs hsc_env mod rdr_env type_env $ do
+		                        { core_prs <- dsTopLHsBinds auto_scc binds_cvr
 		                        ; (ds_fords, foreign_prs) <- dsForeigns fords
 		                        ; let all_prs = foreign_prs ++ core_prs
 		                              local_bndrs = mkVarSet (map fst all_prs)
 		                        ; ds_rules <- mappM (dsRule mod local_bndrs) rules
-		                        ; return (all_prs, catMaybes ds_rules, ds_fords)
+		                        ; return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info)
+                                        ; dbgSites_var <- getBkptSitesDs
+                                        ; dbgSites <- ioToIOEnv$ readIORef dbgSites_var
+		                        ; return (all_prs, catMaybes ds_rules, ds_fords, ds_hpc_info, dbgSites)
 		                        }
 	; case mb_res of {
 	   Nothing -> return Nothing ;
-	   Just (all_prs, ds_rules, ds_fords) -> do
+	   Just (all_prs, ds_rules, ds_fords,ds_hpc_info, dbgSites) -> do
 
 	{ 	-- Add export flags to bindings
 	  keep_alive <- readIORef keep_var
@@ -139,9 +149,10 @@ deSugar hsc_env
 	     le_dep_mod :: (ModuleName, IsBootInterface) -> (ModuleName, IsBootInterface) -> Bool	 
 	     le_dep_mod (m1,_) (m2,_) = moduleNameFS m1 <= moduleNameFS m2
 
-	     deps = Deps { dep_mods  = sortLe le_dep_mod dep_mods,
-			   dep_pkgs  = sortLe (<=)   pkgs,	
-			   dep_orphs = sortLe le_mod (imp_orphs imports) }
+	     deps = Deps { dep_mods   = sortLe le_dep_mod dep_mods,
+			   dep_pkgs   = sortLe (<=)   pkgs,	
+			   dep_orphs  = sortLe le_mod (imp_orphs  imports),
+			   dep_finsts = sortLe le_mod (imp_finsts imports) }
 		-- sort to get into canonical order
 
 	     mod_guts = ModGuts {	
@@ -159,8 +170,9 @@ deSugar hsc_env
 		mg_fam_insts = fam_insts,
 	        mg_rules     = ds_rules,
 		mg_binds     = ds_binds,
-		mg_foreign   = ds_fords }
-	
+		mg_foreign   = ds_fords,
+		mg_hpc_info  = ds_hpc_info,
+                mg_dbg_sites = dbgSites }
         ; return (Just mod_guts)
 	}}}