X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=compiler%2Fiface%2FMkIface.lhs;h=564d3a4a7d695aa1c78c6d2654b5e4cfb420df56;hp=8213cb1a8061886858de9e7825315e47eb000470;hb=c1681a73fa4ca4cf8758264ae387ac09a9e900d8;hpb=e04f49034968322349e0f3f608e1b5a856fd6521

diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index 8213cb1..564d3a4 100644
--- a/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
@@ -244,7 +244,8 @@ mkIface hsc_env maybe_old_iface
 		      mg_deps      = deps,
 		      mg_rdr_env   = rdr_env,
 		      mg_fix_env   = fix_env,
-		      mg_deprecs   = src_deprecs})
+		      mg_deprecs   = src_deprecs,
+	              mg_hpc_info  = hpc_info })
 	(ModDetails{  md_insts 	   = insts, 
 		      md_fam_insts = fam_insts,
 		      md_rules 	   = rules,
@@ -304,6 +305,7 @@ mkIface hsc_env maybe_old_iface
                         mi_finsts    = False,   -- Ditto
 			mi_decls     = deliberatelyOmitted "decls",
 			mi_ver_fn    = deliberatelyOmitted "ver_fn",
+			mi_hpc       = isHpcUsed hpc_info,
 
 			-- And build the cached values
 			mi_dep_fn = mkIfaceDepCache deprecs,
@@ -339,18 +341,18 @@ mkIface hsc_env maybe_old_iface
      deliberatelyOmitted x = panic ("Deliberately omitted: " ++ x)
      ifFamInstTcName = ifaceTyConName . ifFamInstTyCon
 
-     flattenVectInfo (VectInfo { vectInfoCCVar   = ccVar
-                               , vectInfoCCTyCon = ccTyCon
+     flattenVectInfo (VectInfo { vectInfoVar   = vVar
+                               , vectInfoTyCon = vTyCon
                                }) = 
        IfaceVectInfo { 
-         ifaceVectInfoCCVar        = [ Var.varName v 
-                                     | (v, _) <- varEnvElts ccVar],
-         ifaceVectInfoCCTyCon      = [ tyConName t 
-                                     | (t, t_CC) <- nameEnvElts ccTyCon
-                                     , t /= t_CC],
-         ifaceVectInfoCCTyConReuse = [ tyConName t
-                                     | (t, t_CC) <- nameEnvElts ccTyCon
-                                     , t == t_CC]
+         ifaceVectInfoVar        = [ Var.varName v 
+                                   | (v, _) <- varEnvElts vVar],
+         ifaceVectInfoTyCon      = [ tyConName t 
+                                   | (t, t_v) <- nameEnvElts vTyCon
+                                   , t /= t_v],
+         ifaceVectInfoTyConReuse = [ tyConName t
+                                   | (t, t_v) <- nameEnvElts vTyCon
+                                   , t == t_v]
        } 
 
 -----------------------------
@@ -472,7 +474,8 @@ addVersionInfo ver_fn (Just old_iface@(ModIface {
 
 	-- If the usages havn't changed either, we don't need to write the interface file
     no_other_changes = mi_usages new_iface == mi_usages old_iface && 
-		       mi_deps new_iface == mi_deps old_iface
+		       mi_deps new_iface == mi_deps old_iface &&
+		       mi_hpc new_iface == mi_hpc old_iface
     no_change_at_all = no_output_change && no_other_changes
  
     pp_diffs = vcat [pp_change no_export_change "Export list"