X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FMkIface.lhs;h=811af49947157fde2727b2d660181b4e7e8ae5aa;hb=098f818b622e5095fbd3f6318a463fcb2ce14fc6;hp=df5bc086ea1e5b88b4fccab178a492eb51a69fd1;hpb=7fa861d23122d4d6a3053c09b5c636bad0478ad3;p=ghc-hetmet.git

diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index df5bc08..811af49 100644
--- a/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
@@ -195,6 +195,8 @@ import TcRnMonad
 import HscTypes
 
 import DynFlags
+import VarEnv
+import Var
 import Name
 import NameEnv
 import NameSet
@@ -242,11 +244,11 @@ mkIface hsc_env maybe_old_iface
 		      mg_deps      = deps,
 		      mg_rdr_env   = rdr_env,
 		      mg_fix_env   = fix_env,
-		      mg_deprecs   = src_deprecs,
-                      mg_vect_info = vect_info })
+		      mg_deprecs   = src_deprecs})
 	(ModDetails{  md_insts 	   = insts, 
 		      md_fam_insts = fam_insts,
 		      md_rules 	   = rules,
+                      md_vect_info = vect_info,
 		      md_types 	   = type_env,
 		      md_exports   = exports })
 	
@@ -272,6 +274,7 @@ mkIface hsc_env maybe_old_iface
 		; iface_rules = map (coreRuleToIfaceRule this_mod) rules
 		; iface_insts = map instanceToIfaceInst insts
 		; iface_fam_insts = map famInstToIfaceFamInst fam_insts
+                ; iface_vect_info = flattenVectInfo vect_info
 
 	        ; intermediate_iface = ModIface { 
 			mi_module   = this_mod,
@@ -286,6 +289,8 @@ mkIface hsc_env maybe_old_iface
 			mi_fam_insts= sortLe le_fam_inst iface_fam_insts,
 			mi_rules    = sortLe le_rule iface_rules,
 
+                        mi_vect_info = iface_vect_info,
+
 			mi_fixities = fixities,
 			mi_deprecs  = deprecs,
 			mi_globals  = Just rdr_env,
@@ -300,8 +305,6 @@ mkIface hsc_env maybe_old_iface
 			mi_decls     = deliberatelyOmitted "decls",
 			mi_ver_fn    = deliberatelyOmitted "ver_fn",
 
-                        mi_vect_info = flattenVectInfo vect_info,
-
 			-- And build the cached values
 			mi_dep_fn = mkIfaceDepCache deprecs,
 			mi_fix_fn = mkIfaceFixCache fixities }
@@ -336,7 +339,8 @@ mkIface hsc_env maybe_old_iface
      deliberatelyOmitted x = panic ("Deliberately omitted: " ++ x)
      ifFamInstTcName = ifaceTyConName . ifFamInstTyCon
 
-     flattenVectInfo (VectInfo ccVar) = IfaceVectInfo (nameSetToList ccVar)
+     flattenVectInfo (VectInfo ccVar) = 
+       IfaceVectInfo [Var.varName v | (v, _) <- varEnvElts ccVar]
 
 -----------------------------
 writeIfaceFile :: DynFlags -> ModLocation -> ModIface -> IO ()