Extend IfaceSyn.eqIfTc to cover type kind variants from FC

[ghc-hetmet.git] / compiler / codeGen / CgProf.hs

diff --git a/compiler/codeGen/CgProf.hs b/compiler/codeGen/CgProf.hs
index 1488e34..daff2f6 100644 (file)
--- a/compiler/codeGen/CgProf.hs
+++ b/compiler/codeGen/CgProf.hs
@@ -43,12 +43,13 @@ import MachOp
 import CmmUtils                ( zeroCLit, mkIntCLit, mkLblExpr )
 import CLabel          ( mkCCLabel, mkCCSLabel, mkRtsDataLabel )
 
-import Module          ( moduleString )
+import Module          ( moduleNameString )
+import qualified Module ( moduleName ) -- clashes with CgMonad.moduleName
 import Id              ( Id )
 import CostCentre
 import StgSyn          ( GenStgExpr(..), StgExpr )
 import StaticFlags     ( opt_SccProfilingOn )
-import FastString      ( FastString, mkFastString, LitString ) 
+import FastString      ( FastString )
 import Constants       -- Lots of field offsets
 import Outputable
 
@@ -292,7 +293,10 @@ emitCostCentreDecl
    -> Code
 emitCostCentreDecl cc = do 
   { label <- mkStringCLit (costCentreUserName cc)
-  ; modl  <- mkStringCLit (moduleString (cc_mod cc))
+  ; modl  <- mkStringCLit (moduleNameString (Module.moduleName (cc_mod cc)))
+                -- All cost centres will be in the main package, since we
+                -- don't normally use -auto-all or add SCCs to other packages.
+                -- Hence don't emit the package name in the module here.
   ; let
      lits = [ zero,    -- StgInt ccID,
              label,    -- char *label,