From 53ebe8abd4f307200f8f513e0ebb11f4d0cd14d9 Mon Sep 17 00:00:00 2001 From: "andy@galois.com" Date: Wed, 11 Jul 2007 07:05:55 +0000 Subject: Adding support for package names into hpc outputed code We store .mix files in .hpc//.mix The package main the empty package (aka other naming passes), so Main just is stored in .hpc/Main.tix This change in backwards compatable. --- compiler/deSugar/Coverage.lhs | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'compiler/deSugar/Coverage.lhs') diff --git a/compiler/deSugar/Coverage.lhs b/compiler/deSugar/Coverage.lhs index a9b1a528e4..8d9090073c 100644 --- a/compiler/deSugar/Coverage.lhs +++ b/compiler/deSugar/Coverage.lhs @@ -28,6 +28,7 @@ import UniqFM import Type import TyCon import FiniteMap +import PackageConfig import Data.Array import System.Time (ClockTime(..)) @@ -91,15 +92,20 @@ addCoverageTicksToBinds dflags mod mod_loc tyCons binds = do -- write the mix entries for this module hashNo <- if opt_Hpc then do let hpc_dir = hpcDir dflags + + let hpc_mod_dir = if modulePackageId mod == mainPackageId + then hpc_dir + else hpc_dir ++ "/" ++ packageIdString (modulePackageId mod) + let tabStop = 1 -- counts as a normal char in GHC's location ranges. - createDirectoryIfMissing True hpc_dir + createDirectoryIfMissing True hpc_mod_dir modTime <- getModificationTime orig_file let entries' = [ (hpcPos, box) | (span,_,box) <- entries, hpcPos <- [mkHpcPos span] ] when (length entries' /= tickBoxCount st) $ do panic "the number of .mix entries are inconsistent" let hashNo = mixHash orig_file modTime tabStop entries' - mixCreate hpc_dir mod_name + mixCreate hpc_mod_dir mod_name $ Mix orig_file modTime (toHash hashNo) tabStop entries' return $ hashNo else do -- cgit v1.2.1