X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=compiler%2Ftypecheck%2FFamInst.lhs;h=fd98fe919a9ab64da5b930e1c73ba2cc1ce6dee5;hb=940524aec90652b5ef81789c9a453c57c0e42cc9;hp=9c5b597f216d773655b795e16564712cef26251a;hpb=f4510d27c5883fe7e8570f4dd49d45a8b0122f2c;p=ghc-hetmet.git

diff --git a/compiler/typecheck/FamInst.lhs b/compiler/typecheck/FamInst.lhs
index 9c5b597..fd98fe9 100644
--- a/compiler/typecheck/FamInst.lhs
+++ b/compiler/typecheck/FamInst.lhs
@@ -18,6 +18,7 @@ import Name
 import Module
 import SrcLoc
 import Outputable
+import UniqFM
 import FiniteMap
 
 import Maybe
@@ -64,6 +65,7 @@ instance Ord ModulePair where
 --
 type ModulePairSet = FiniteMap ModulePair ()
 
+listToSet :: [ModulePair] -> ModulePairSet
 listToSet l = listToFM (zip l (repeat ()))
 
 checkFamInstConsistency :: [Module] -> [Module] -> TcM ()
@@ -78,7 +80,14 @@ checkFamInstConsistency famInstMods directlyImpMods
                    Nothing    -> panic "FamInst.checkFamInstConsistency"
                    Just iface -> iface
 
-             ; modInstsEnv   = eps_mod_fam_inst_env eps
+             ; hmiModule     = mi_module . hm_iface
+	     ; hmiFamInstEnv = mkFamInstEnv . md_fam_insts . hm_details
+	     ; mkFamInstEnv  = extendFamInstEnvList emptyFamInstEnv
+             ; hptModInsts   = [ (hmiModule hmi, hmiFamInstEnv hmi) 
+			       | hmi <- eltsUFM hpt]
+             ; modInstsEnv   = eps_mod_fam_inst_env eps	-- external modules
+			       `extendModuleEnvList`	-- plus
+			       hptModInsts		-- home package modules
 	     ; groups        = map (dep_finsts . mi_deps . modIface) 
 				   directlyImpMods
 	     ; okPairs       = listToSet $ concatMap allPairs groups
@@ -95,7 +104,9 @@ checkFamInstConsistency famInstMods directlyImpMods
     allPairs []     = []
     allPairs (m:ms) = map (ModulePair m) ms ++ allPairs ms
 
-    -- Check the consistency of the family instances of the two modules.
+    -- The modules are guaranteed to be in the environment, as they are either
+    -- already loaded in the EPS or they are in the HPT.
+    --
     check modInstsEnv (ModulePair m1 m2)
       = let { instEnv1 = fromJust . lookupModuleEnv modInstsEnv $ m1
 	    ; instEnv2 = fromJust . lookupModuleEnv modInstsEnv $ m2