X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Fiface%2FMkIface.lhs;h=6bbb5998e3b57a4614b15feb3db2221ec9ee3091;hb=61e253e98937a2b83454f4d5ab3c94ef8c2dc81e;hp=489c2f7abd17c1ba07276ce386352c932972af31;hpb=de21f53e25eb67248ba416187d34ba7ec9ec143a;p=ghc-hetmet.git

diff --git a/compiler/iface/MkIface.lhs b/compiler/iface/MkIface.lhs
index 489c2f7..6bbb599 100644
--- a/compiler/iface/MkIface.lhs
+++ b/compiler/iface/MkIface.lhs
@@ -705,7 +705,7 @@ bump_unless False v = bumpVersion v
 
 \begin{code}
 mkUsageInfo :: HscEnv 
-	    -> ModuleEnv (Module, Bool, SrcSpan)
+	    -> ModuleEnv (Module, [(ModuleName, Bool, SrcSpan)])
 	    -> [(ModuleName, IsBootInterface)]
 	    -> NameSet -> IO [Usage]
 mkUsageInfo hsc_env dir_imp_mods dep_mods used_names
@@ -717,6 +717,12 @@ mkUsageInfo hsc_env dir_imp_mods dep_mods used_names
 	 -- don't get evaluated for a while and we can end up hanging on to
 	 -- the entire collection of Ifaces.
 
+mk_usage_info :: PackageIfaceTable
+              -> HscEnv
+              -> ModuleEnv (Module, [(ModuleName, Bool, SrcSpan)])
+              -> [(ModuleName, IsBootInterface)]
+              -> NameSet
+              -> [Usage]
 mk_usage_info pit hsc_env dir_imp_mods dep_mods used_names
   = mapCatMaybes mkUsage dep_mods
 	-- ToDo: do we need to sort into canonical order?
@@ -739,8 +745,8 @@ mk_usage_info pit hsc_env dir_imp_mods dep_mods used_names
     		     add_item occs _ = occ:occs
     
     depend_on_exports mod = case lookupModuleEnv dir_imp_mods mod of
-    				Just (_,no_imp,_) -> not no_imp
-	    			Nothing		  -> True
+    				Just (_, xs) -> any (\(_, no_imp, _) -> not no_imp) xs
+	    			Nothing		 -> True
     
     -- We want to create a Usage for a home module if 
     --	a) we used something from; has something in used_names
@@ -1212,7 +1218,7 @@ tyThingToIfaceDecl (ATyCon tycon)
 		    ifConUnivTvs = toIfaceTvBndrs (dataConUnivTyVars data_con),
 		    ifConExTvs   = toIfaceTvBndrs (dataConExTyVars data_con),
 		    ifConEqSpec  = to_eq_spec (dataConEqSpec data_con),
-		    ifConCtxt    = toIfaceContext (dataConTheta data_con),
+		    ifConCtxt    = toIfaceContext (dataConEqTheta data_con ++ dataConDictTheta data_con),
 		    ifConArgTys  = map toIfaceType (dataConOrigArgTys data_con),
 		    ifConFields  = map getOccName 
 				       (dataConFieldLabels data_con),